From a4e5b9d604ef3536264ba12e2ddf2e4e67831157 Mon Sep 17 00:00:00 2001
From: Richard <richard.kichert@gmail.com>
Date: Sun, 30 Apr 2017 13:41:54 +0200
Subject: [PATCH] Correct globalFolder-URLs also on multi-lang sites

Plyrtag builds invalid urls for global audio- and video-folders and does not take into account different baseURLs on multi-language sites.
With this change it works both in single- and multi-language sites, with and without globalFolder settings as expected.
Tested on my own multi-language site, as well as a clean Kirby starterkit (single-language) and Kirby langkit (multi-language).
---
 site/tags/plyrtag.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/site/tags/plyrtag.php b/site/tags/plyrtag.php
index 9735f95..f2217ac 100644
--- a/site/tags/plyrtag.php
+++ b/site/tags/plyrtag.php
@@ -28,7 +28,11 @@
       // check if should use globalVideoFolder
       if (c::get('plyrtag.globalVideoFolder', false) == true) {
         $globalVideoFolderName = c::get('plyrtag.globalVideoFolderName', 'video');
-        $baseVideoPath =  $tag->page()->site()->url() . url($globalVideoFolderName . '/');
+        if ($tag->page()->site()->languages()) { // multi-language site
+          $baseVideoPath = $tag->page()->site()->language()->url() . '/' . $globalVideoFolderName . '/';
+        } else { // single-language site
+          $baseVideoPath = $tag->page()->site()->url() . '/' . $globalVideoFolderName . '/';
+        }
       } else {
         $baseVideoPath = $tag->page()->url() . '/';
       }
@@ -76,7 +80,11 @@
       // check if should use globalAudioFolder
       if (c::get('plyrtag.globalAudioFolder', false) == true) {
         $globalAudioFolderName = c::get('plyrtag.globalAudioFolderName', 'audio');
-        $baseAudioPath =  $tag->page()->site()->url() . url($globalAudioFolderName . '/');
+        if ($tag->page()->site()->languages()) { // multi-language site
+          $baseAudioPath = $tag->page()->site()->language()->url() . '/' . $globalAudioFolderName . '/';
+        } else { // single-language site
+          $baseAudioPath = $tag->page()->site()->url() . '/' . $globalAudioFolderName . '/';
+        }
       } else {
         $baseAudioPath = $tag->page()->url() . '/';
       }