summaryrefslogtreecommitdiffstats
path: root/system/libraries/Loader.php
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-01-22 02:47:11 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-01-22 02:47:11 +0100
commit22259b5d0518ed67eaffc5513c3b49e4b08407c0 (patch)
tree7c48f00f4fa0fbbb99cb2989bf76752ab40aa240 /system/libraries/Loader.php
parentd912dbdeb7db1c2d994c5ae642e6bcc325122c1a (diff)
Diffstat (limited to 'system/libraries/Loader.php')
-rw-r--r--system/libraries/Loader.php20
1 files changed, 8 insertions, 12 deletions
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']);
+ }
+
}
// --------------------------------------------------------------------