Core: load favicon from theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>
nextcloud · Nov 18, 2016 · da6285b · da6285b
1 parent e5f8f28
commit da6285b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
@@ -157,7 +157,9 @@ public function imagePath($app, $image) {
 
  // Check if the app is in the app folder
  $path = '';
- if (file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$image")) {
+ if(\OCP\App::isEnabled('theming') && $image === "favicon.ico" && $app !== "") {
+ $path = $this->linkToRoute('theming.Icon.getFavicon', [ '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")
  && file_exists(\OC::$SERVERROOT . "/themes/$theme/apps/$app/img/$basename.png")) {