summaryrefslogtreecommitdiffstats
path: root/system/database
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/database
parent788b00f7eaad969120079acedc82e8d60b0e2a46 (diff)
fixed bug where active record override wasn't being honored properly
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index 0f734d748..0451c18e6 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -22,7 +22,7 @@
* @author ExpressionEngine Dev Team
* @link http://codeigniter.com/user_guide/database/
*/
-function &DB($params = '', $active_record_override = FALSE)
+function &DB($params = '', $active_record_override = NULL)
{
// Load the DB config file if a DSN string wasn't passed
if (is_string($params) AND strpos($params, '://') === FALSE)
@@ -102,9 +102,9 @@ function &DB($params = '', $active_record_override = FALSE)
// based on whether we're using the active record class or not.
// Kudos to Paul for discovering this clever use of eval()
- if ($active_record_override == TRUE)
+ if ($active_record_override !== NULL)
{
- $active_record = TRUE;
+ $active_record = $active_record_override;
}
require_once(BASEPATH.'database/DB_driver'.EXT);