diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-12 10:56:34 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-12 10:56:34 +0200 |
| commit | bffe3fb935c8a28e1ccacf56f678a491edcff043 (patch) | |
| tree | 5a39ba6907623d5ad46b7d13ef17e360df1dfe5e /system/core/Config.php | |
| parent | 55b82c95be57a6727d45d6ae9652ff612f96bc37 (diff) | |
| parent | 9ae82faaad2f6b07a050d79129652b74483d1da0 (diff) | |
Merge changes from develop
Diffstat (limited to 'system/core/Config.php')
| -rw-r--r-- | system/core/Config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Config.php b/system/core/Config.php index 2f6a9e085..8e4f998ef 100644 --- a/system/core/Config.php +++ b/system/core/Config.php @@ -102,7 +102,7 @@ class CI_Config { { $file = ($file === '') ? 'config' : str_replace('.php', '', $file); $found = $loaded = FALSE; - + $check_locations = defined('ENVIRONMENT') ? array(ENVIRONMENT.'/'.$file, $file) : array($file); |