diff options
| author | Julius Härtl <jus@bitgrid.net> | 2022-03-08 15:37:53 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2022-03-08 15:37:53 +0100 |
| commit | e8cf1a87599abf48d22042e79a0d61910935ee42 (patch) | |
| tree | e81777275829b60928e64fefe8ee64d87b176d90 /lib/private/Template | |
| parent | 23e8ae15aaea30359a927492155de13c97b311ce (diff) | |
| download | nextcloud-server-e8cf1a87599abf48d22042e79a0d61910935ee42.tar.gz nextcloud-server-e8cf1a87599abf48d22042e79a0d61910935ee42.zip | |
Avoid double-loading dist/core-main.js when apps have scripts named main
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Template')
| -rw-r--r-- | lib/private/Template/JSResourceLocator.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index 1421e28033a..bf84e1ae958 100644 --- 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; |