Merge pull request #9430 from piwik/8869

Higher resolution 32x32 Piwik favicon 

core/FrontController.php

@@ -395,7 +395,7 @@ class FrontController extends Singleton
         } catch (Exception $ex) {
         }
         $logoUrl = $logoUrl ?: 'plugins/Morpheus/images/logo-header.png';
-        $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.ico';
+        $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.png';
 
         $page = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/maintenance.tpl');
         $page = str_replace('%logoUrl%', $logoUrl, $page);

core/SettingsPiwik.php

@@ -310,7 +310,7 @@ class SettingsPiwik
             $fetched = "ERROR fetching: " . $e->getMessage();
         }
         // this will match when Piwik not installed yet, or favicon not customised
-        $expectedStringAlt = 'plugins/CoreHome/images/favicon.ico';
+        $expectedStringAlt = 'plugins/CoreHome/images/favicon.png';
 
         // this will match when Piwik is installed and favicon has been customised
         $expectedString = 'misc/user/';

core/testMinimumPhpVersion.php

@@ -127,7 +127,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
         }
 
         if (empty($faviconUrl)) {
-            $faviconUrl = "plugins/CoreHome/images/favicon.ico";
+            $faviconUrl = "plugins/CoreHome/images/favicon.png";
         }
 
         if ($optionalTrace) {

plugins/CoreHome/templates/_favicon.twig

 {% if isCustomLogo and customFavicon is defined and customFavicon %}
     <link rel="shortcut icon" href="{{ customFavicon }}"/>
 {% else %}
-    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/>
 {% endif %}
\ No newline at end of file

plugins/Installation/templates/layout.twig

@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
     <link rel="stylesheet" type="text/css" href="plugins/Installation/stylesheets/installation.css"/>
 
-    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/>
 
     <script type="text/javascript" src="libs/bower_components/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script>