Merge branch 'next_release' into 4.x-dev

1 files changed, 16 insertions, 1 deletions

diff --git a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
index 9ac1edaec7..bfd73ca039 100644
--- a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
@@ -276,7 +276,22 @@ class PluginUmdAssetFetcher extends UIAssetFetcher
     private static function getRelativePluginDirectory($plugin)
     {
         $result = self::getPluginDirectory($plugin);
-        $result = str_replace(PIWIK_INCLUDE_PATH . '/', '', $result);
+
+        $matomoPath = rtrim(PIWIK_INCLUDE_PATH, '/') . '/';
+        $webroots = array_merge(
+            Manager::getAlternativeWebRootDirectories(),
+            [$matomoPath => '/']
+        );
+
+        foreach ($webroots as $webrootAbsolute => $webrootRelative) {
+            if (strpos($result, $webrootAbsolute) === 0) {
+                $result = str_replace($webrootAbsolute, $webrootRelative, $result);
+                break;
+            }
+        }
+
+        $result = ltrim($result, '/');
+
         return $result;
     }