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
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-05-21 06:41:27 +0400
committermattab <matthieu.aubry@gmail.com>2014-05-21 06:41:27 +0400
commit4350dded477766cc1e4d80ce0adad18e430c20f8 (patch)
treeb72568ee8cfe0e105c97cab9f5afe88bd38e04a8 /core/SettingsPiwik.php
parent81b634369775c0eac5e10ea311dc6651dd3f6e45 (diff)
Fix installer regression
Diffstat (limited to 'core/SettingsPiwik.php')
-rw-r--r--core/SettingsPiwik.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 4f71551475..64eb343c5c 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -384,6 +384,11 @@ class SettingsPiwik
return Config::getHostname();
}
+ // config.ini.php not ready yet, instance_id will not be set
+ if(!Config::getInstance()->existsLocalConfig()) {
+ return false;
+ }
+
$instanceId = @Config::getInstance()->General['instance_id'];
if(!empty($instanceId)) {
return $instanceId;