summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorFu Xu <fuxu@fuxu.name>2014-06-12 10:45:00 +0200
committerFu Xu <fuxu@fuxu.name>2014-06-12 10:45:00 +0200
commitb3355196d8a0541812fa0883e7fcdac912fa6d98 (patch)
tree035b6de20162ecc62a26cdc451b3d0d8d0287153 /system
parent94293adfa2dea87ae0fc4ced4ba58dd9184a3adc (diff)
config load bug fix
Diffstat (limited to 'system')
-rw-r--r--system/core/Config.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index ad0e5f981..6650c4cc9 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';
@@ -358,4 +359,4 @@ class CI_Config {
}
/* End of file Config.php */
-/* Location: ./system/core/Config.php */ \ No newline at end of file
+/* Location: ./system/core/Config.php */