summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-03-07 14:56:04 +0100
committerDerek Jones <derek.jones@ellislab.com>2010-03-07 14:56:04 +0100
commit8fae08c0343550702e75f318b818c4b454c7aca3 (patch)
treede0fd7eae5c863cbca77507817331dbf767dd9d3 /system/core
parentc64ca0128ab0cc015ed37d1833bd79ee63e35eba (diff)
parent8dca04163a79701021043fcd3e267a5d965af993 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php23
1 files changed, 23 insertions, 0 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index f70ee0334..c399f296d 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -544,6 +544,29 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
+ * Driver
+ *
+ * Loads a driver library
+ *
+ * @param string the name of the class
+ * @param mixed the optional parameters
+ * @param string an optional object name
+ * @return void
+ */
+ function driver($library = '', $params = NULL, $object_name = NULL)
+ {
+ if ( ! class_exists('CI_Driver_Library'))
+ {
+ // we aren't instantiating an object here, that'll be done by the Library itself
+ require_once BASEPATH.'libraries/Driver'.EXT;
+ }
+
+ return $this->library($library, $params, $object_name);
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Add Package Path
*
* Prepends a parent path to the library, model, helper, and config path arrays