diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:33:37 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:33:37 +0100 |
| commit | 838ab99854bc3eb2b9495ce5db92cd6611ef813e (patch) | |
| tree | eec6eb0bebe3102512df2f532ae90d8d533ecb69 /system/core/Loader.php | |
| parent | 65b568fcd444fbeaf6fa9130289c254e34e5bbbd (diff) | |
| parent | 820999cb0d82c80d6dc5dde133568812c8113e29 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driver
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 |