upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #22585 from nextcloud/backport/22550/stable18

Browse source 
[stable18] Use the correct root to determinate the webroot for the resource
This commit is contained in:
Joas Schilling 2020-09-04 15:37:00 +02:00 committed by GitHub
commit 806f8a561a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);
}
}
}