summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
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');
}