Allow config file paths to be specified in Config constructor.

1 files changed, 4 insertions, 6 deletions

diff --git a/core/Config.php b/core/Config.php
index 75fc2b3b3c..dacc5d4014 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -61,9 +61,11 @@ class Config extends Singleton
     /**
      * Constructor
      */
-    protected function __construct()
+    public function __construct($pathGlobal = null, $pathLocal = null, $pathCommon = null)
     {
-        $this->clear();
+        $this->pathGlobal = $pathGlobal ?: self::getGlobalConfigPath();
+        $this->pathCommon = $pathCommon ?: self::getCommonConfigPath();
+        $this->pathLocal = $pathLocal ?: self::getLocalConfigPath();
     }
 
     /**
@@ -260,10 +262,6 @@ class Config extends Singleton
         $this->configLocal = array();
         $this->configCache = array();
         $this->initialized = false;
-
-        $this->pathGlobal = self::getGlobalConfigPath();
-        $this->pathCommon = self::getCommonConfigPath();
-        $this->pathLocal = self::getLocalConfigPath();
     }
 
     /**