fixed bug where active record override wasn't being honored properly
diff --git a/system/database/DB.php b/system/database/DB.php
index 0f734d7..0451c18 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 @@
// 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);