diff options
| author | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
|---|---|---|
| committer | bubbafoley <devnull@localhost> | 2011-03-17 20:55:41 +0100 |
| commit | 0ea04149bbae0fdcde92b7362e7cbd76f0df3865 (patch) | |
| tree | 9e7c26f6ccec07636c424003331fbcbc41ea95ff /system/core/Loader.php | |
| parent | ee8a712b10b517a90f03ac858312a82e0fb5d492 (diff) | |
load config files from environment specific locations in core classes, helpers and libraries
Diffstat (limited to 'system/core/Loader.php')
| -rw-r--r-- | system/core/Loader.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 7003318ee..75c09435d 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -975,7 +975,15 @@ class CI_Loader { */ function _ci_autoloader() { - include_once(APPPATH.'config/autoload'.EXT); + if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT)) + { + include_once(APPPATH.'config/'.ENVIRONMENT.'/autoload'.EXT); + } + else + { + include_once(APPPATH.'config/autoload'.EXT); + } + if ( ! isset($autoload)) { |