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

Use the correct root to determinate the webroot for the resource 

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-02 17:13:24 +02:00 committed by backportbot[bot]
parent 77edd1e11d
commit fc0cdbb4a0
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];
} }
} }
} }