upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 16:50:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Use the correct root to determinate the webroot for the resource

Browse source 
Since all the compiled routes are based on the server webroot,
we have to use this, independent from which app this belongs to.

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-09-04 13:20:42 +02:00
parent 95c6a9124e
commit 117705c2df
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Template/CSSResourceLocator.php
View file

@ -109,7 +109,7 @@ class CSSResourceLocator extends ResourceLocator {
if($this->scssCacher !== null) {
if($this->scssCacher->process($root, $file, $app)) {
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
$this->append($this->serverroot, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
return true;
} else {
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@ -145,7 +145,7 @@ class CSSResourceLocator extends ResourceLocator {
}
}
$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
$this->resources[] = array($webRoot ?: \OC::$WEBROOT, $webRoot, $file);
}
}
}