diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-08-28 09:04:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 09:04:01 +0200 |
| commit | ccbeb0fe078a55ed94691559fe4fbab2e95e3214 (patch) | |
| tree | b85db2331acb91eec5d51e4fbe9323d3f10e8754 | |
| parent | a0e4445cb58233593f6cf3bf8256f0e85938a153 (diff) | |
| parent | e1803a72b03b6d4cd4ea7de3a6f877a495e1b091 (diff) | |
| download | nextcloud-server-ccbeb0fe078a55ed94691559fe4fbab2e95e3214.tar.gz nextcloud-server-ccbeb0fe078a55ed94691559fe4fbab2e95e3214.zip | |
Merge pull request #33694 from nextcloud/fix/load-themedir-dist
| -rw-r--r-- | lib/private/Template/JSResourceLocator.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index f672102c0e8..9e76655aba2 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -71,14 +71,14 @@ class JSResourceLocator extends ResourceLocator { } elseif ($this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') || $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js') || $this->appendIfExist($this->serverroot, $script.'.js') - || $this->appendIfExist($this->serverroot, "$theme_dir.'dist/$app-$scriptName.js") + || $this->appendIfExist($this->serverroot, $theme_dir . "dist/$app-$scriptName.js") || $this->appendIfExist($this->serverroot, "dist/$app-$scriptName.js") || $this->appendIfExist($this->serverroot, 'apps/'.$script.'.js') || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json') || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js') || $this->appendIfExist($this->serverroot, 'core/'.$script.'.js') - || (strpos($scriptName, '/') === -1 && ($this->appendIfExist($this->serverroot, "dist/core-$scriptName.js") - || $this->appendIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName.js"))) + || (strpos($scriptName, '/') === -1 && ($this->appendIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName.js") + || $this->appendIfExist($this->serverroot, "dist/core-$scriptName.js"))) || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, 'core/'.$script.'.json') ) { return; |