diff options
author | diosmosis <benakamoorthi@fastmail.fm> | 2014-04-08 20:45:02 +0400 |
---|---|---|
committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-04-08 20:45:16 +0400 |
commit | df48874df01cfaa14e29e3190ea948ec12bcb37e (patch) | |
tree | 20eb83698837cbc4d5fbc6ac6e4de8d01eef2eba /core/Config.php | |
parent | 320eb7865ba18c5624dda7acce675f955a4986a4 (diff) |
Check if pathGlobal is empty in Config::setTestEnvironment and make sure when a local config file is specified in TestingEnvironment it is actually used.
Diffstat (limited to 'core/Config.php')
-rw-r--r-- | core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Config.php b/core/Config.php index 041f09e975..71f576c482 100644 --- a/core/Config.php +++ b/core/Config.php @@ -134,7 +134,7 @@ class Config extends Singleton } // Ensure local mods do not affect tests - if (is_null($pathGlobal)) { + if (empty($pathGlobal)) { $this->configCache['log'] = $this->configGlobal['log']; $this->configCache['Debug'] = $this->configGlobal['Debug']; $this->configCache['mail'] = $this->configGlobal['mail']; |