Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2015-12-22 05:43:22 +0300
committermattab <matthieu.aubry@gmail.com>2015-12-22 05:43:22 +0300
commite7147488dc94d6e527cef767c2be54ad62061314 (patch)
treea3b12544d3588cfad7bb8958a36ad504f9618860 /core
parent12174ce107e5f3ddad59996f2cef295b2b6bc85b (diff)
Higher resolution 32x32 favicon https://github.com/piwik/piwik/issues/8869
Diffstat (limited to 'core')
-rw-r--r--core/FrontController.php2
-rw-r--r--core/SettingsPiwik.php2
-rw-r--r--core/testMinimumPhpVersion.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/FrontController.php b/core/FrontController.php
index 780960465e..40f8f38155 100644
--- a/core/FrontController.php
+++ b/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);
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index f7036dd46a..7a50263e39 100644
--- a/core/SettingsPiwik.php
+++ b/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/';
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 82c0375960..8eab5bdf01 100644
--- a/core/testMinimumPhpVersion.php
+++ b/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) {