summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-06-12 14:04:52 +0200
committerAndrey Andreev <narf@devilix.net>2014-06-12 14:04:52 +0200
commit7cea03ba6367919c25665b28644951588f817abd (patch)
tree37d6ab2d685fafbf0ccb2b721343f5dbedc88f69 /system
parent94293adfa2dea87ae0fc4ced4ba58dd9184a3adc (diff)
parent0bd32a66e5787ddb22a903d2ee718b3c872be454 (diff)
Merge pull request #3103 from dickfu/fix_config_load
config load bug fix
Diffstat (limited to 'system')
-rw-r--r--system/core/Config.php3
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';