diff options
| author | yaoshanliang <1329517386@qq.com> | 2015-03-16 09:14:36 +0100 |
|---|---|---|
| committer | yaoshanliang <1329517386@qq.com> | 2015-03-16 09:14:36 +0100 |
| commit | 787dc9de5f7bae54817e252edee1bfcc7b271571 (patch) | |
| tree | 8f97861bdb1dc181e423b27eb90498cc5fae34ee /system | |
| parent | 19c2847a7c24daa0c2999b77ce82ae199afadda9 (diff) | |
| parent | 7f310d63d61e9b334385ef5f6501129d685924ba (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index b9af8e3b2..d07000ac9 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -123,7 +123,7 @@ class CI_Config { foreach ($this->_config_paths as $path) { - foreach (array($file, ENVIRONMENT.'/'.$file) as $location) + foreach (array($file, ENVIRONMENT.DIRECTORY_SEPARATOR.$file) as $location) { $file_path = $path.'config/'.$location.'.php'; if (in_array($file_path, $this->is_loaded, TRUE)) |