From 2d65b8c600580cd64aa599a791a467101b873c5a Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Sun, 14 Aug 2016 12:24:51 +0200 Subject: Theming: Add favicon-touch and fix icon creation with non svg images Signed-off-by: Julius Haertl --- lib/private/URLGenerator.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/private') 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") -- cgit v1.2.3