diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2016-11-10 16:16:33 +0100 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-01-06 09:42:13 +0100 |
commit | 3b62003c9c085dc76357220fc83f14bcf96c60a2 (patch) | |
tree | e30b5286208c5dff3c0fc58c8dc9e37e47bc4464 /lib/private/Template/ResourceLocator.php | |
parent | 2f5f1096ad3d754ae4e55d5e53be44e5bba9db19 (diff) | |
download | nextcloud-server-3b62003c9c085dc76357220fc83f14bcf96c60a2.tar.gz nextcloud-server-3b62003c9c085dc76357220fc83f14bcf96c60a2.zip |
Injection fix and log appname fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private/Template/ResourceLocator.php')
-rwxr-xr-x | lib/private/Template/ResourceLocator.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php index bb4cfa94f6c..d5187ef0710 100755 --- a/lib/private/Template/ResourceLocator.php +++ b/lib/private/Template/ResourceLocator.php @@ -115,19 +115,21 @@ abstract class ResourceLocator { * @param string|null $webRoot base for path, default map $root to $webRoot * @return bool True if the resource was found and cached, false otherwise */ - protected function cacheAndAppendScssIfExist($root, $file, $appData, $webRoot = null) { + protected function cacheAndAppendScssIfExist($root, $file, $appData, $urlGenerator, $systemConfig, $webRoot = null) { if (is_file($root.'/'.$file)) { $scssCache = new \OC\Template\SCSSCacher( $this->logger, $root, $file, - $appData); + $appData, + $urlGenerator, + $systemConfig); if($scssCache->process()) { $this->append($root, $scssCache->getCachedSCSS(), $webRoot, false); return true; } else { - $this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'server']); + $this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']); return false; } } |