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:
authordiosmosis <benaka@piwik.pro>2015-04-06 10:12:40 +0300
committerdiosmosis <benaka@piwik.pro>2015-04-06 10:12:40 +0300
commit5ef736693ff4d69aa4ef27dc40e26dc518270039 (patch)
tree5aeafae26951edd057a4334b76e416d383738888 /core/Config.php
parentc13355116a724d0ccf9671cdced207e0c71fe2d4 (diff)
Fixing Installation UI tests.
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/Config.php b/core/Config.php
index d4a0f7f40c..905b8a378d 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -433,6 +433,15 @@ class Config extends Singleton
public function &__get($name)
{
if (!$this->initialized) {
+ $this->initialized = true;
+
+ // this is done lazily and not in __construct so Installation will properly be triggered. ideally, it should be
+ // done in __construct, but the exception that is thrown depends on Translator which depends on Config. the
+ // circular dependency causes problems.
+ if (!SettingsServer::isTrackerApiRequest()) {
+ $this->checkLocalConfigFound();
+ }
+
$this->postConfigTestEvent();
}