diff options
author | Julius Härtl <jus@bitgrid.net> | 2018-06-05 17:59:05 +0300 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2018-06-06 14:15:52 +0300 |
commit | 5b0ce806a3679b34ae3a6f8e6ae32a0b513a4ca9 (patch) | |
tree | bdda614353703033cfa26bfd9b8687b2579be3e0 /apps/theming/lib/ThemingDefaults.php | |
parent | d132527aa9c4baad344b11adef3a6f4a46cde3ab (diff) |
Minor fixes and cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming/lib/ThemingDefaults.php')
-rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index a46676a43a9..d29eb69873f 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -317,10 +317,10 @@ class ThemingDefaults extends \OC_Defaults { $customFavicon = null; } - if ($image === 'favicon.ico' && ($customFavicon !== null || $this->shouldReplaceIcons())) { + if ($image === 'favicon.ico' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) { return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]) . '?v=' . $cacheBusterValue; } - if ($image === 'favicon-touch.png' && ($customFavicon !== null || $this->shouldReplaceIcons())) { + if ($image === 'favicon-touch.png' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) { return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]) . '?v=' . $cacheBusterValue; } if ($image === 'manifest.json') { @@ -334,19 +334,7 @@ class ThemingDefaults extends \OC_Defaults { } return false; } - - /** - * Check if Imagemagick is enabled and if SVG is supported - * otherwise we can't render custom icons - * - * TODO: move to usage of image manager - * - * @return bool - */ - public function shouldReplaceIcons() { - return $this->imageManager->shouldReplaceIcons(); - } - + /** * Increases the cache buster key */ |