diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
| commit | 4a485a73d64a8bebc7625aabc5fdc361d5e7dc56 (patch) | |
| tree | cb18690c4de1c6ca008227260f9dd0cd2b9279d2 /system/core/Config.php | |
| parent | 39ec29585b7cdca7edc1a0757c913a13a2ee4f85 (diff) | |
| parent | d444d445ed0458a352ecb9ff79ffd158677ee805 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index ad0e5f981..db406dfde 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -104,10 +104,11 @@ class CI_Config { public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE) { $file = ($file === '') ? 'config' : str_replace('.php', '', $file); - $found = $loaded = FALSE; + $loaded = FALSE; foreach ($this->_config_paths as $path) { + $found = FALSE; foreach (array(ENVIRONMENT.'/'.$file, $file) as $location) { $file_path = $path.'config/'.$location.'.php'; |