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-21 18:51:28 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-03-21 18:51:28 +0400
commit1152e54a02c054fc220df9f13f4b76838049a2e6 (patch)
treeaa4b12e5676cc3bd800046ea688a7d73a2eea9ff /core/Config.php
parent5dde9fe0fab0ad9b6d8738f3c33e38881ec300dc (diff)
Fixing build (really this time).
Diffstat (limited to 'core/Config.php')
-rw-r--r--core/Config.php14
1 files changed, 3 insertions, 11 deletions
diff --git a/core/Config.php b/core/Config.php
index dacc5d4014..4d0c4d9a65 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -86,17 +86,9 @@ class Config extends Singleton
$this->clear();
- if ($pathLocal) {
- $this->pathLocal = $pathLocal;
- }
-
- if ($pathGlobal) {
- $this->pathGlobal = $pathGlobal;
- }
-
- if ($pathCommon) {
- $this->pathCommon = $pathCommon;
- }
+ $this->pathLocal = $pathLocal ?: self::getLocalConfigPath();
+ $this->pathGlobal = $pathGlobal ?: self::getGlobalConfigPath();
+ $this->pathCommon = $pathCommon ?: self::getCommonConfigPath();
$this->init();