summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-10-12 16:29:35 +0200
committerGreg Aker <greg.aker@ellislab.com>2010-10-12 16:29:35 +0200
commitce43396cb7beb49558cd78cf7ef51956a74b8185 (patch)
treee93e0e7d0f5814b086acd34fef88cfe5d2c75755 /system
parentc288ea957dd5b01abba96c9644f309a2714482e7 (diff)
Fix #83 where multiple libraries could not be loaded at once by passing an array to the load->library() function.
Diffstat (limited to 'system')
-rw-r--r--system/core/Loader.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 316985609..e64006e93 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;