From 3a7d6846facec4e03966ab8e03f0fcbd946a8ef0 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 9 Nov 2016 11:18:43 +0100 Subject: Appdata integration 1 & log fix 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- lib/private/Template/CSSResourceLocator.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/private/Template/CSSResourceLocator.php') diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 353555a6811..2e1db9a6757 100755 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -26,14 +26,22 @@ namespace OC\Template; class CSSResourceLocator extends ResourceLocator { + + protected $appData; + + public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map, $appData) { + $this->appData = $appData; + parent::__construct($logger, $theme, $core_map, $party_map); + } + /** * @param string $style */ public function doFind($style) { if (strpos($style, '3rdparty') === 0 && $this->appendIfExist($this->thirdpartyroot, $style.'.css') - || $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss') - || $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss') + || $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss', $this->appData) + || $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss', $this->appData) || $this->appendIfExist($this->serverroot, $style.'.css') || $this->appendIfExist($this->serverroot, 'core/'.$style.'.css') ) { -- cgit v1.2.3