Clearing the config in init() which can be called multiple times

derSascha · Feb 20, 2015 · ec9ba8d · ec9ba8d
1 parent 1504ebb
commit ec9ba8d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/core/Config.php b/core/Config.php
@@ -126,8 +126,6 @@ public function setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathC
             $this->isTest = true;
         }
 
-        $this->clear();
-
         $this->pathLocal = $pathLocal ?: Config::getLocalConfigPath();
         $this->pathGlobal = $pathGlobal ?: Config::getGlobalConfigPath();
         $this->pathCommon = $pathCommon ?: Config::getCommonConfigPath();
@@ -281,8 +279,9 @@ public function forceUsageOfLocalHostnameConfig($hostname)
     {
         $hostConfig = self::getLocalConfigInfoForHostname($hostname);
 
-        if (!Filesystem::isValidFilename($hostConfig['file'])) {
-            throw new Exception('Hostname is not valid');
+        $filename = $hostConfig['file'];
+        if (!Filesystem::isValidFilename($filename)) {
+            throw new Exception('Piwik domain is not a valid looking hostname (' . $filename . ').');
         }
 
         $this->pathLocal   = $hostConfig['path'];
@@ -308,6 +307,7 @@ public function clear()
     {
         $this->configGlobal = array();
         $this->configLocal = array();
+        $this->configCommon = array();
         $this->configCache = array();
         $this->initialized = false;
     }
@@ -319,6 +319,7 @@ public function clear()
      */
     public function init()
     {
+        $this->clear();
         $this->initialized = true;
         $reportError = SettingsServer::isTrackerApiRequest();