diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-03-12 15:21:52 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-03-12 15:21:52 +0100 |
| commit | 21e7a3b315335a622b73710f0effa09dc0f85bb6 (patch) | |
| tree | 248d2cc2f6d2414dcbd9e6b9523f1409409b61fa /system/core/Loader.php | |
| parent | 5fbaf27ac9da632b520457e91d9088e9aab6df89 (diff) | |
| parent | 6b4deae9143c4419654e4321fe49330eca493acf (diff) | |
merged latest develop 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 |