aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2022-01-06 17:59:07 +0100
committerJohn Molakvoæ <skjnldsv@protonmail.com>2022-01-08 10:15:48 +0100
commit6f62c17a95b9bac78cb064e7b51bcbae28decffa (patch)
tree7c9e80bf2ba6cfdaa263dc175c710c5fe6ca7f9b /lib/private
parent8a56713c382875a14e601691f8db61edabd06cb4 (diff)
downloadnextcloud-server-6f62c17a95b9bac78cb064e7b51bcbae28decffa.tar.gz
nextcloud-server-6f62c17a95b9bac78cb064e7b51bcbae28decffa.zip
Detect app's script higher up as some scripts were shadowed
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Template/JSResourceLocator.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php
index e283ad479c6..1421e28033a 100644
--- a/lib/private/Template/JSResourceLocator.php
+++ b/lib/private/Template/JSResourceLocator.php
@@ -70,6 +70,7 @@ class JSResourceLocator extends ResourceLocator {
|| $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')
|| $this->appendIfExist($this->serverroot, $script.'.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')