diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-06-15 17:02:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 17:02:14 +0200 |
| commit | 8f6acbff621b02cead64219eb9e6b03f4951075a (patch) | |
| tree | 68dec6474e476078801be1cd2de3036401c3fc8b /apps/theming/lib/Controller/IconController.php | |
| parent | d82ef721611654aa3a3aab0ea3c8c85c7e0187d6 (diff) | |
| parent | ceee91d9d455eed8b01942bc56767c69077e9f3f (diff) | |
| download | nextcloud-server-8f6acbff621b02cead64219eb9e6b03f4951075a.tar.gz nextcloud-server-8f6acbff621b02cead64219eb9e6b03f4951075a.zip | |
Merge pull request #9258 from nextcloud/theming-logo-png
Convert theming app logo to PNG to show it properly in emails
Diffstat (limited to 'apps/theming/lib/Controller/IconController.php')
| -rw-r--r-- | apps/theming/lib/Controller/IconController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index 0caf9a2bc37..a2727546e09 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -119,7 +119,7 @@ class IconController extends Controller { $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']); } catch (NotFoundException $e) { } - if ($iconFile === null && $this->themingDefaults->shouldReplaceIcons()) { + if ($iconFile === null && $this->imageManager->shouldReplaceIcons()) { try { $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app); } catch (NotFoundException $exception) { @@ -155,7 +155,7 @@ class IconController extends Controller { $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']); } catch (NotFoundException $e) { } - if ($this->themingDefaults->shouldReplaceIcons()) { + if ($this->imageManager->shouldReplaceIcons()) { try { $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app); } catch (NotFoundException $exception) { |