From 22259b5d0518ed67eaffc5513c3b49e4b08407c0 Mon Sep 17 00:00:00 2001 From: Derek Allard Date: Tue, 22 Jan 2008 01:47:11 +0000 Subject: --- system/libraries/Loader.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'system/libraries') diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index e2420a0c0..b760d67a1 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -895,11 +895,7 @@ class CI_Loader { } } - // Autoload models - if (isset($autoload['model'])) - { - $this->model($autoload['model']); - } + // A little tweak to remain backward compatible // The $autoload['core'] item was deprecated @@ -930,14 +926,14 @@ class CI_Loader { { $this->library($item); } - - // Load the model class. - if (in_array('model', $autoload['libraries'])) - { - $this->model(); - $autoload['libraries'] = array_diff($autoload['libraries'], array('model')); - } } + + // Autoload models + if (isset($autoload['model'])) + { + $this->model($autoload['model']); + } + } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b