summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorMike Funk <mfunk@xulonpress.com>2012-03-12 14:44:42 +0100
committerMike Funk <mfunk@xulonpress.com>2012-03-12 14:44:42 +0100
commit306f56c1bfdafd149b1059325a687ec1a185d00f (patch)
tree62e2261c3b429153b9e62f3f676d7de6c18a6bfb /system/core/Loader.php
parentdb70d047a6ac256eb336a2b04385aa010d6cbf42 (diff)
parentb3442a165a091c552a3331ece94297d5fe316fee (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/all_flashdata
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php13
1 files changed, 11 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 20cf7ef33..9b9cc2fef 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -2,7 +2,7 @@
/**
* CodeIgniter
*
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
*
* NOTICE OF LICENSE
*
@@ -615,13 +615,22 @@ class CI_Loader {
*
* Loads a driver library
*
- * @param string the name of the class
+ * @param mixed the name of the class or array of classes
* @param mixed the optional parameters
* @param string an optional object name
* @return void
*/
public function driver($library = '', $params = NULL, $object_name = NULL)
{
+ if (is_array($library))
+ {
+ foreach ($library as $driver)
+ {
+ $this->driver($driver);
+ }
+ return FALSE;
+ }
+
if ( ! class_exists('CI_Driver_Library'))
{
// we aren't instantiating an object here, that'll be done by the Library itself