When loading a template url from a custom plugin directory, prefix the relative directory (#14717)

* When loading a template url from a custom plugin directory, prefix the relative directory

* detect relative dir partially

* replace the initial plugins part as well

* only print info for activated plugins

* Update _jsGlobalVariables.twig

* remove duplicate endif

* Update http404check.js

2 files changed, 14 insertions, 1 deletions

diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 9b4f8dbf2c..1568b3145d 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -35,6 +35,7 @@ use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Url;
+use Piwik\Plugin;
 use Piwik\View;
 use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
@@ -748,6 +749,9 @@ abstract class Controller
             $view->setXFrameOptions('sameorigin');
         }
 
+        $pluginManager = Plugin\Manager::getInstance();
+        $view->relativePluginWebDirs = (object) $pluginManager->getWebRootDirectoriesForCustomPluginDirs();
+
         self::setHostValidationVariablesView($view);
     }
 
@@ -1063,3 +1067,4 @@ abstract class Controller
         }
     }
 }
+
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index e6872ef5a6..b47ffc0983 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -55,6 +55,7 @@ class Manager
     protected $doLoadPlugins = true;
 
     protected static $pluginsToPathCache = array();
+    protected static $pluginsToWebRootDirCache = array();
 
     private $pluginsLoadedAndActivated;
 
@@ -409,6 +410,11 @@ class Manager
         return $dirs;
     }
 
+    public function getWebRootDirectoriesForCustomPluginDirs()
+    {
+        return array_intersect_key(self::$pluginsToWebRootDirCache, array_flip($this->pluginsToLoad));
+    }
+
     /**
      * Returns the path to all plugins directories. Each plugins directory may contain several plugins.
      * All paths have a trailing slash '/'.
@@ -465,10 +471,11 @@ class Manager
             return self::$pluginsToPathCache[$pluginName];
         }
 
-        foreach (self::getPluginsDirectories() as $dir) {
+        foreach (self::getAlternativeWebRootDirectories() as $dir => $relative) {
             $path = $dir . $pluginName;
             if (is_dir($path)) {
                 self::$pluginsToPathCache[$pluginName] = self::getPluginRealPath($path);
+                self::$pluginsToWebRootDirCache[$pluginName] = $relative;
                 return $path;
             }
         }
@@ -1640,3 +1647,4 @@ class Manager
         }
     }
 }
+