summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 83d134ef4..d42dbbf38 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1139,7 +1139,14 @@ class CI_Loader {
*/
protected function _ci_autoloader()
{
- load_environ_config('autoload');
+ if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
+ {
+ include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
+ }
+ else
+ {
+ include(APPPATH.'config/autoload.php');
+ }
if ( ! isset($autoload))
{