diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2016-11-09 11:18:43 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-01-06 09:42:13 +0100 |
| commit | 3a7d6846facec4e03966ab8e03f0fcbd946a8ef0 (patch) | |
| tree | 4eb8cd80b39fc8edecca3c51dbb9f3978e02eaa4 /lib/private/Template/CSSResourceLocator.php | |
| parent | cf73e71ff16027099ff5b006f445f7d193b0c5e7 (diff) | |
| download | nextcloud-server-3a7d6846facec4e03966ab8e03f0fcbd946a8ef0.tar.gz nextcloud-server-3a7d6846facec4e03966ab8e03f0fcbd946a8ef0.zip | |
Appdata integration 1 & log fix 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private/Template/CSSResourceLocator.php')
| -rwxr-xr-x | lib/private/Template/CSSResourceLocator.php | 12 |
1 files changed, 10 insertions, 2 deletions
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') ) { |