summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Controller.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 768b154e8..5a32e65c0 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -232,16 +232,20 @@ class Controller extends CI_Base {
}
unset($autoload['config']);
- if ( ! is_array($autoload['core']))
+ // A little tweak to remain backward compatible
+ // The $autoload['core'] item was deprecated
+ if ( ! isset($autoload['libraries']))
{
- $autoload['core'] = array($autoload['core']);
+ $autoload['libraries'] = $autoload['core'];
+
}
- foreach ($autoload['core'] as $item)
+ foreach ($autoload['libraries'] as $item)
{
$this->_ci_initialize($item);
}
-
+ unset($autoload['libraries']);
+
return $autoload;
}
// END _ci_autoload()