From b3355196d8a0541812fa0883e7fcdac912fa6d98 Mon Sep 17 00:00:00 2001 From: Fu Xu Date: Thu, 12 Jun 2014 16:45:00 +0800 Subject: config load bug fix --- system/core/Config.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'system') 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 */ -- cgit v1.2.3-24-g4f1b From 66b181e56c38f0834342abc1bb9ed20c51aef240 Mon Sep 17 00:00:00 2001 From: Fu Xu Date: Thu, 12 Jun 2014 16:49:11 +0800 Subject: style change --- system/core/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system') diff --git a/system/core/Config.php b/system/core/Config.php index 6650c4cc9..bd197925a 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -108,7 +108,7 @@ class CI_Config { foreach ($this->_config_paths as $path) { - $found = FALSE; + $found = FALSE; foreach (array(ENVIRONMENT.'/'.$file, $file) as $location) { $file_path = $path.'config/'.$location.'.php'; -- cgit v1.2.3-24-g4f1b From 0bd32a66e5787ddb22a903d2ee718b3c872be454 Mon Sep 17 00:00:00 2001 From: Fu Xu Date: Thu, 12 Jun 2014 19:58:51 +0800 Subject: remove the empty line at the end of file --- system/core/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system') diff --git a/system/core/Config.php b/system/core/Config.php index bd197925a..db406dfde 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -359,4 +359,4 @@ class CI_Config { } /* End of file Config.php */ -/* Location: ./system/core/Config.php */ +/* Location: ./system/core/Config.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b