diff options
| author | Stephan Orbaugh <62374139+sorbaugh@users.noreply.github.com> | 2025-04-29 09:10:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-29 09:10:51 +0200 |
| commit | f9b6b88d5ce4fbd69bafea63b350c1cb0f3c8465 (patch) | |
| tree | 142dd6f15eacbf962161ea6c2c7d41137c899251 | |
| parent | 0d98f91ae6111ccab69750445165e645a3e9aac8 (diff) | |
| parent | f428e6786ba53c1441128d2200d7d26e24db1d31 (diff) | |
| download | nextcloud-server-f9b6b88d5ce4fbd69bafea63b350c1cb0f3c8465.tar.gz nextcloud-server-f9b6b88d5ce4fbd69bafea63b350c1cb0f3c8465.zip | |
Merge pull request #52479 from RobertZenz/bugfix/fix-jsresourcelocator-incorrect-parameter
fix(JSResourceLocator) fix incorrect parameter being used.
| -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 aad999f939a..a6d2d13a2ad 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -69,7 +69,7 @@ class JSResourceLocator extends ResourceLocator { || $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName") || $this->appendScriptIfExist($appRoot, $script, $appWebRoot) || $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script . '.json') - || $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $appWebRoot) + || $this->cacheAndAppendCombineJsonIfExist($appRoot, $script . '.json', $app) || $this->appendScriptIfExist($this->serverroot, $theme_dir . 'core/' . $script) || $this->appendScriptIfExist($this->serverroot, 'core/' . $script) || (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir . "dist/core-$scriptName") |