diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
| commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
| tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /system/core/Config.php | |
| parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
| parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
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); |