mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22579 from nextcloud/backport/22550/stable19 

[stable19] Use the correct root to determinate the webroot for the resource
This commit is contained in:
Roeland Jago Douma 2020-09-04 12:35:21 +02:00 committed by GitHub
parent 757a35bd01 fc0cdbb4a0
commit c1b971ec63
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 (is_file($root.'/'.$file)) { if (is_file($root.'/'.$file)) {
if ($this->scssCacher !== null) { if ($this->scssCacher !== null) {
if ($this->scssCacher->process($root, $file, $app)) { 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; return true;
} else { } else {
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']); $this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@ -145,7 +145,7 @@ class CSSResourceLocator extends ResourceLocator {
} }
} }
$this->resources[] = [$webRoot? : \OC::$WEBROOT, $webRoot, $file]; $this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
} }
} }
} }