summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
committerGreg Aker <greg@gregaker.net>2011-12-25 08:24:29 +0100
commit5c1aa631c5f5ec2f6b75ba1158178418e50ba11a (patch)
tree3dc36050275f67bbb7ba52f92d62609b12291369 /system/core/Loader.php
parent11ce5da8c743b5f6592c83a2b91e545d76a8789b (diff)
Abstracting the loading of files in the config directory depending on environments.
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 4e14b54af..12d07bbe0 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1125,14 +1125,7 @@ class CI_Loader {
*/
protected function _ci_autoloader()
{
- if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'))
- {
- include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php');
- }
- else
- {
- include(APPPATH.'config/autoload.php');
- }
+ load_environ_config('autoload');
if ( ! isset($autoload))
{