diff options
| author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
|---|---|---|
| committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
| commit | 44a6d1da2be916fe0f23a3ea4d5fcb391d7f65dd (patch) | |
| tree | 31549ebf6ea5ea98e4347eb640d1caa685316f3e /system/core/Config.php | |
| parent | 353f9834adf3f44c6c7a0f924089bb2b43360404 (diff) | |
| parent | eb291c1d1e1116a4420fa30e587adeea0451eeb7 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 0160d1a15..7e64444bc 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -106,13 +106,9 @@ class CI_Config { $file = ($file === '') ? 'config' : str_replace('.php', '', $file); $found = $loaded = FALSE; - $check_locations = defined('ENVIRONMENT') - ? array(ENVIRONMENT.'/'.$file, $file) - : array($file); - foreach ($this->_config_paths as $path) { - foreach ($check_locations as $location) + foreach (array(ENVIRONMENT.'/'.$file, $file) as $location) { $file_path = $path.'config/'.$location.'.php'; |