From: Joas Schilling <coding@schilljs.com>
Date: Wed, 2 Sep 2020 15:13:24 +0000 (+0200)
Subject: Use the correct root to determinate the webroot for the resource
X-Git-Tag: v20.0.0beta4~67^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=87aa9b187e07c8042ae10ab55254068df60a04b0;p=nextcloud-server.git

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>
---

diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 750d33fd726..b5c16d1690b 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -109,7 +109,7 @@ class CSSResourceLocator extends ResourceLocator {
 		if (is_file($root.'/'.$file)) {
 			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[] = [$webRoot? : \OC::$WEBROOT, $webRoot, $file];
+			$this->resources[] = [$webRoot ?: \OC::$WEBROOT, $webRoot, $file];
 		}
 	}
 }