summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-03-24 16:28:40 +0100
committerAndrey Andreev <narf@devilix.net>2014-03-24 16:28:40 +0100
commit689d41c1860e372fc3a3178be075d5573e520cdc (patch)
tree9a52cfb3b9152b6112768509cbde34f71181fdda
parent1a61ba4a40bd589b9c95399da93129a77e8eb4e6 (diff)
Yet another modification of CI_Loader::_ci_autoload()
-rw-r--r--system/core/Loader.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 087d37762..9169a1252 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -1215,10 +1215,9 @@ class CI_Loader {
// Load any custom config file
if (count($autoload['config']) > 0)
{
- $CFG =& get_instance()->config;
foreach ($autoload['config'] as $val)
{
- $CFG->load($val);
+ $this->config($val);
}
}