Set debugMode after reading the config file

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/config.php b/lib/config.php
index adf70ac841a..afd74c56b40 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -49,12 +49,17 @@ class Config {
 
 	protected $debugMode;
 
-	public function __construct($configDir, $debugMode) {
+	public function __construct($configDir) {
 		$this->configDir = $configDir;
-		$this->debugMode = $debugMode;
 		$this->configFilename = $this->configDir.'config.php';
 		$this->readData();
+		$this->setDebugMode(defined('DEBUG') && DEBUG);
 	}
+
+	public function setDebugMode($enable) {
+		$this->debugMode = $enable;
+	}
+
 	/**
 	 * @brief Lists all available config keys
 	 * @return array with key names
diff --git a/lib/legacy/config.php b/lib/legacy/config.php
index 635f0af66f8..f68d7c31b25 100644
--- a/lib/legacy/config.php
+++ b/lib/legacy/config.php
@@ -38,7 +38,7 @@
  * This class is responsible for reading and writing config.php, the very basic
  * configuration file of ownCloud.
  */
-OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/', defined('DEBUG') && DEBUG);
+OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/');
 class OC_Config {
 
 	public static $object;