summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-12-05 16:31:44 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-12-05 16:31:44 +0100
commitffca6c2202f89249d3bc50b5645b94c772ff3b0d (patch)
tree57ad3a4dc84fff090ea64e8c8c2c68d5cf7f316d /system/libraries
parent788b00f7eaad969120079acedc82e8d60b0e2a46 (diff)
fixed bug where active record override wasn't being honored properly
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 781c83c65..710c5c148 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -198,7 +198,7 @@ class CI_Loader {
* @param bool whether to enable active record (this allows us to override the config setting)
* @return object
*/
- function database($params = '', $return = FALSE, $active_record = FALSE)
+ function database($params = '', $return = FALSE, $active_record = NULL)
{
// Grab the super object
$CI =& get_instance();