diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-03-08 16:29:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 16:29:13 +0100 |
| commit | ec4280eda06168ea02783760591cd6d3acd2701a (patch) | |
| tree | bc9196964b7949f3c720e5e40b74b55cc60e8964 | |
| parent | e8872f01ae850bcbf66220beba44463f68e3d673 (diff) | |
| parent | e8cf1a87599abf48d22042e79a0d61910935ee42 (diff) | |
| download | nextcloud-server-ec4280eda06168ea02783760591cd6d3acd2701a.tar.gz nextcloud-server-ec4280eda06168ea02783760591cd6d3acd2701a.zip | |
Merge pull request #31493 from nextcloud/bugfix/noid/app-script-main
| -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; |