summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-03-05 10:36:25 +0100
committerAndrey Andreev <narf@devilix.net>2015-03-05 10:36:25 +0100
commit137aa20e0b0fd71ff8f672c57c07c4972c91c6a4 (patch)
tree47784eb45d2468f956ea77b8c237a621ef5d5b64
parente1a5bb345b1b30ea777348efa9cade21c1f2e2fb (diff)
Fix #3642
-rw-r--r--system/core/Config.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/system/core/Config.php b/system/core/Config.php
index a191a7727..b9af8e3b2 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -126,7 +126,6 @@ class CI_Config {
foreach (array($file, ENVIRONMENT.'/'.$file) as $location)
{
$file_path = $path.'config/'.$location.'.php';
-
if (in_array($file_path, $this->is_loaded, TRUE))
{
return TRUE;
@@ -165,14 +164,13 @@ class CI_Config {
$loaded = TRUE;
log_message('debug', 'Config file loaded: '.$file_path);
}
-
- if ($loaded === TRUE)
- {
- return TRUE;
- }
}
- if ($fail_gracefully === TRUE)
+ if ($loaded === TRUE)
+ {
+ return TRUE;
+ }
+ elseif ($fail_gracefully === TRUE)
{
return FALSE;
}