Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-09-04 14:20:42 +0300
committerJoas Schilling <coding@schilljs.com>2020-09-04 14:20:42 +0300
commit117705c2df2ea08695c50c89f2a4eb2b0f33e96d (patch)
tree62adf24cbafbd27fe2555d56af69a6c2555bc085 /lib
parent95c6a9124eddfb2c90a06f0659353a30e46feea4 (diff)
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Template/CSSResourceLocator.php4
1 files 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);
}
}
}