From ffca6c2202f89249d3bc50b5645b94c772ff3b0d Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Sat, 5 Dec 2009 15:31:44 +0000 Subject: fixed bug where active record override wasn't being honored properly --- system/database/DB.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/database/DB.php') 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); -- cgit v1.2.3-24-g4f1b