diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-09-04 12:35:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 12:35:21 +0200 |
| commit | c1b971ec639b9dbfee8753214acc4b0545318e28 (patch) | |
| tree | 5f7c6ecd6ce10b523ed13f3f72d77fce87d777bd /lib | |
| parent | 757a35bd01d34d95fe51d2cd1dd87c6b87b10517 (diff) | |
| parent | fc0cdbb4a0c4ba30165aa0ab62369b3feb990367 (diff) | |
| download | nextcloud-server-c1b971ec639b9dbfee8753214acc4b0545318e28.tar.gz nextcloud-server-c1b971ec639b9dbfee8753214acc4b0545318e28.zip | |
Merge pull request #22579 from nextcloud/backport/22550/stable19
[stable19] Use the correct root to determinate the webroot for the resource
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Template/CSSResourceLocator.php | 4 |
1 files changed, 2 insertions, 2 deletions
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]; } } } |