upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #40898 from Murena-SAS/dev/custom-apps-assets

Browse source
This commit is contained in:
Julius Härtl 2023-10-30 16:18:30 +01:00 committed by GitHub
commit 51eb44dbfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Template/JSResourceLocator.php
View file

@ -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;