diff options
| author | diosmosis <benaka@piwik.pro> | 2015-03-01 10:13:57 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-03-02 00:34:43 +0300 |
| commit | e3f6ab457c20126125db24d1e890d814fe808ff8 (patch) | |
| tree | ea6b2910fbe5b679b921fc44da7c7d28c0cd3116 /core/Config.php | |
| parent | 8ff84e61ddb4aff85b08de1c3ad7f83ccc380e95 (diff) | |
Attempting to fix Installation UI tests.
Diffstat (limited to 'core/Config.php')
| -rw-r--r-- | core/Config.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Config.php b/core/Config.php index 665156d29b..b47384e450 100644 --- a/core/Config.php +++ b/core/Config.php @@ -72,7 +72,6 @@ class Config extends Singleton $this->pathLocal = $pathLocal ?: self::getLocalConfigPath(); $this->settings = new IniFileChain(); - $this->reload(array($this->pathGlobal, $this->pathCommon), $this->pathLocal); } /** @@ -314,7 +313,6 @@ class Config extends Singleton * * @throws \Exception if the global config file is not found and this is a tracker request, or * if the local config file is not found and this is NOT a tracker request. - * @api */ public function reload() { @@ -340,6 +338,8 @@ class Config extends Singleton // decode section datas $this->decodeValues($this->settings->getAll()); + + $this->initialized = true; } public function existsLocalConfig() @@ -412,7 +412,7 @@ class Config extends Singleton public function &__get($name) { if (!$this->initialized) { - $this->initialized = true; + $this->reload(array($this->pathGlobal, $this->pathCommon), $this->pathLocal); // must be called here, not in init(), since setTestEnvironment() calls init(). (this avoids // infinite recursion) |