From 117705c2df2ea08695c50c89f2a4eb2b0f33e96d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 4 Sep 2020 13:20:42 +0200 Subject: [PATCH] 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 --- lib/private/Template/CSSResourceLocator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 94eac48b61f..13f4ff95444 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -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); } } } -- 2.39.5