When Piwik is not installed yet, the app-id match did not work.

1 files changed, 7 insertions, 2 deletions

diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index c05547d529..723ea065dc 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -304,9 +304,14 @@ class SettingsPiwik
         } catch (Exception $e) {
             $fetched = "ERROR fetching: " . $e->getMessage();
         }
-        $expectedString = 'app-id=737216887';
+        // this will match when Piwik not installed yet, or favicon not customised
+        $expectedStringAlt = 'plugins/CoreHome/images/favicon.ico';
 
-        if (strpos($fetched, $expectedString) === false) {
+        // this will match when Piwik is installed and favicon has been customised
+        $expectedString = 'misc/user/favicon.png';
+
+        $expectedStringNotFound = strpos($fetched, $expectedString) === false && strpos($fetched, $expectedStringAlt) === false;
+        if ($expectedStringNotFound) {
             throw new Exception("\nPiwik should be running at: "
                 . $piwikServerUrl
                 . " but this URL returned an unexpected response: '"