summaryrefslogtreecommitdiffstats
path: root/lib/private/URLGenerator.php
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2016-08-14 12:53:16 +0200
committerJulius Haertl <jus@bitgrid.net>2016-11-18 10:23:23 +0100
commitc7adcb85aefc384a59c6081015537a603a675c3e (patch)
tree0a70838d937acb18d39e50b977b56cd19b14b813 /lib/private/URLGenerator.php
parent64510bd87aaca44af3048121aff38d65c7712ae3 (diff)
downloadnextcloud-server-c7adcb85aefc384a59c6081015537a603a675c3e.tar.gz
nextcloud-server-c7adcb85aefc384a59c6081015537a603a675c3e.zip
Theming: Fix default parameters in icon routes
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/URLGenerator.php')
-rw-r--r--lib/private/URLGenerator.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
index 8972f1602e3..f8b79dedd8e 100644
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -158,8 +158,10 @@ class URLGenerator implements IURLGenerator {
// Check if the app is in the app folder
$path = '';
if(\OCP\App::isEnabled('theming') && $image === "favicon.ico") {
+ if($app==="") { $app = "core"; }
$path = $this->linkToRoute('theming.Icon.getFavicon', [ 'app' => $app ]);
} elseif(\OCP\App::isEnabled('theming') && $image === "favicon-touch.png") {
+ if($app==="") { $app = "core"; }
$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";