diff options
| author | Julius Härtl <jus@bitgrid.net> | 2023-10-30 16:18:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 16:18:30 +0100 |
| commit | 51eb44dbfef18e057d7f3a0373bb73e670be478c (patch) | |
| tree | 301c42d9b89756fae427aba51a541b1e90957f1d /lib | |
| parent | 57569951df2c27a7bbae8230f48aed7f63dd720a (diff) | |
| parent | 5e20c3e7b97598a8e632d9c5ccdef7de7813a4e8 (diff) | |
| download | nextcloud-server-51eb44dbfef18e057d7f3a0373bb73e670be478c.tar.gz nextcloud-server-51eb44dbfef18e057d7f3a0373bb73e670be478c.zip | |
Merge pull request #40898 from Murena-SAS/dev/custom-apps-assets
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Template/JSResourceLocator.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php index b283f0b610f..68a83fa4b73 100644 --- a/lib/private/Template/JSResourceLocator.php +++ b/lib/private/Template/JSResourceLocator.php @@ -60,8 +60,13 @@ class JSResourceLocator extends ResourceLocator { $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script); $found += $this->appendScriptIfExist($this->serverroot, $script); $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$script); - $found += $this->appendScriptIfExist($this->serverroot, 'apps/'.$script); - $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script); + + foreach (\OC::$APPSROOTS as $appRoot) { + $dirName = basename($appRoot['path']); + $rootPath = dirname($appRoot['path']); + $found += $this->appendScriptIfExist($rootPath, $dirName.'/'.$script); + $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$dirName.'/'.$script); + } if ($found) { return; |