Avoid double-loading dist/core-main.js when apps have scripts named main

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php
index 1421e28033a24833b8204b8aa68c1459397b79db..bf84e1ae95860dc07f41dbd9819bfb2a572db12a 100644 (file)
--- a/lib/private/Template/JSResourceLocator.php
+++ b/lib/private/Template/JSResourceLocator.php
@@ -74,7 +74,7 @@ class JSResourceLocator extends ResourceLocator {
                        || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
                        || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js')
                        || $this->appendIfExist($this->serverroot, 'core/'.$script.'.js')
-                       || $this->appendIfExist($this->serverroot, "dist/core-$scriptName.js")
+                       || (strpos($scriptName, '/') === -1 && $this->appendIfExist($this->serverroot, "dist/core-$scriptName.js"))
                        || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json')
                ) {
                        return;