diff options
author | Julius Haertl <jus@bitgrid.net> | 2016-08-14 12:24:51 +0200 |
---|---|---|
committer | Julius Haertl <jus@bitgrid.net> | 2016-11-18 10:23:22 +0100 |
commit | 2d65b8c600580cd64aa599a791a467101b873c5a (patch) | |
tree | ea138f9e88072bb220ef352f3c911264510692cd /lib/private/URLGenerator.php | |
parent | da6285b84f175640622a020f2d9258cee86a3c14 (diff) | |
download | nextcloud-server-2d65b8c600580cd64aa599a791a467101b873c5a.tar.gz nextcloud-server-2d65b8c600580cd64aa599a791a467101b873c5a.zip |
Theming: Add favicon-touch and fix icon creation with non svg images
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/URLGenerator.php')
-rw-r--r-- | lib/private/URLGenerator.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index e730bf7aedd..8972f1602e3 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -157,8 +157,10 @@ class URLGenerator implements IURLGenerator { // Check if the app is in the app folder $path = ''; - if(\OCP\App::isEnabled('theming') && $image === "favicon.ico" && $app !== "") { + if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") { $path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]); + } elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") { + $path = $this->linkToRoute('theming.Icon.getTouchIcon', [ 'app' => $app ]); } elseif (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) { $path = \OC::$WEBROOT . "/themes/$theme/apps/$app/img/$image"; } elseif (!file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.svg") |