diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:48:00 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:48:00 +0100 |
| commit | 31cf46eaec3b4613d5b46f9caed8bdd346b581cc (patch) | |
| tree | 047b9d74def6254639b3d9b2833f36336dc99f8a /system/core/Loader.php | |
| parent | b68e70b2cd81f83fd038ca2c2d00fde210a8ee0e (diff) | |
| parent | 733921ecc4da80f08a9d50ff0fb05bccf23de09d (diff) | |
Merge upstream branch
Diffstat (limited to 'system/core/Loader.php')
| -rw-r--r-- | system/core/Loader.php | 13 |
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 |