summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-03-24 12:18:38 +0100
committerAndrey Andreev <narf@devilix.net>2014-03-24 12:18:38 +0100
commit85840c476c5caf39137a9753695f12b92d701e75 (patch)
tree1e1b38e52d4f09f76bdc3148e08bda7c980540e6
parent623227ff09e750f6ed131c4c09c69d9a4cb1a523 (diff)
Alter previous commit
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 5747b7918..087d37762 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1215,7 +1215,7 @@ class CI_Loader {
// Load any custom config file
if (count($autoload['config']) > 0)
{
- $CFG =& load_class('Config', 'core');
+ $CFG =& get_instance()->config;
foreach ($autoload['config'] as $val)
{
$CFG->load($val);