diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-09-04 08:58:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 08:58:07 +0200 |
| commit | e690f0e7e383710b0c50421f8a5da43e4416722c (patch) | |
| tree | b13e2aa8d78ea147689e6062fe2df129774415ab | |
| parent | 84fe4447a7ae8cbebdb94e1a75d7e4ab594f36b7 (diff) | |
| parent | 87aa9b187e07c8042ae10ab55254068df60a04b0 (diff) | |
| download | nextcloud-server-e690f0e7e383710b0c50421f8a5da43e4416722c.tar.gz nextcloud-server-e690f0e7e383710b0c50421f8a5da43e4416722c.zip | |
Merge pull request #22550 from nextcloud/bugfix/13556/use-correct-root-when-compiling-scss
Use the correct root to determinate the webroot for the resource
| -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]; } } } |