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 <benakamoorthi@fastmail.fm>2014-03-24 08:11:54 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-03-24 08:22:18 +0400
commit605596a6bf30bde815d299ddb71aafbf5621dcbc (patch)
tree7f0cdf921d53cd5a2b1db446c71964012d81eb0c /core/Config.php
parentbec5dc97a02103316981ae3fb58094f8be1e821e (diff)
Do not overwrite path local/global/common specified in Config constructor in Config::setTestEnvironment.
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Config.php b/core/Config.php
index eae234041e..8e4cad8359 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -116,9 +116,9 @@ class Config extends Singleton
$this->clear();
- $this->pathLocal = $pathLocal ?: self::getLocalConfigPath();
- $this->pathGlobal = $pathGlobal ?: self::getGlobalConfigPath();
- $this->pathCommon = $pathCommon ?: self::getCommonConfigPath();
+ $this->pathLocal = $pathLocal ?: $this->pathLocal;
+ $this->pathGlobal = $pathGlobal ?: $this->pathGlobal;
+ $this->pathCommon = $pathCommon ?: $this->pathCommon;
$this->init();