summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-10-12 16:33:10 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-10-12 16:33:10 +0200
commite4054b8e62bf8dcbfbc689752a6e952fe1aa1be0 (patch)
tree3676937c28bde64a98917c44dbe35530243963fc /system
parent3a082fd3d6cb2e72612d51b9d8e54e93effb93eb (diff)
parentce43396cb7beb49558cd78cf7ef51956a74b8185 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system')
-rw-r--r--system/core/Loader.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 69b3da0c9..5a2175c2d 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -78,6 +78,16 @@ class CI_Loader {
*/
function library($library = '', $params = NULL, $object_name = NULL)
{
+ if (is_array($library))
+ {
+ foreach($library as $read)
+ {
+ $this->library($read);
+ }
+
+ return;
+ }
+
if ($library == '' OR isset($this->_base_classes[$library]))
{
return FALSE;
@@ -177,7 +187,7 @@ class CI_Loader {
$CI->load->database($db_conn, FALSE, TRUE);
}
- if ( ! class_exists('Model'))
+ if ( ! class_exists('CI_Model'))
{
load_class('Model', 'core');
}