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

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years ago · e8cf1a8759
parent 23e8ae15aa
commit e8cf1a8759
1 changed files with 1 additions and 1 deletions
--- 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;