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/CSSResourceLocator.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/CSSResourceLocator.php')
| -rwxr-xr-x | lib/private/Template/CSSResourceLocator.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 0d190959ea1..8e1cb3a761a 100755 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -27,7 +27,12 @@ namespace OC\Template; class CSSResourceLocator extends ResourceLocator { + /** @var IAppData */ protected $appData; + /** @var \OCP\IURLGenerator */ + protected $urlGenerator; + /** @var \OCP\Files\IConfig */ + protected $systemConfig; /** * @param \OCP\ILogger $logger @@ -36,8 +41,11 @@ class CSSResourceLocator extends ResourceLocator { * @param array $party_map * @param IAppData $appData */ - public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map, $appData) { + public function __construct(\OCP\ILogger $logger, $theme, $core_map, $party_map, \OCP\Files\IAppData $appData, \OCP\IURLGenerator $urlGenerator, $systemConfig) { $this->appData = $appData; + $this->urlGenerator = $urlGenerator; + $this->systemConfig = $systemConfig; + parent::__construct($logger, $theme, $core_map, $party_map); } @@ -47,8 +55,8 @@ class CSSResourceLocator extends ResourceLocator { public function doFind($style) { if (strpos($style, '3rdparty') === 0 && $this->appendIfExist($this->thirdpartyroot, $style.'.css') - || $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss', $this->appData) - || $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss', $this->appData) + || $this->cacheAndAppendScssIfExist($this->serverroot, $style.'.scss', $this->appData, $this->urlGenerator, $this->systemConfig) + || $this->cacheAndAppendScssIfExist($this->serverroot, 'core/'.$style.'.scss', $this->appData, $this->urlGenerator, $this->systemConfig) || $this->appendIfExist($this->serverroot, $style.'.css') || $this->appendIfExist($this->serverroot, 'core/'.$style.'.css') ) { |