removed 'active_r' db config variable, replaced with global $active_record setting. (bug report #1834)

1 files changed, 4 insertions, 4 deletions

diff --git a/system/database/DB.php b/system/database/DB.php
index abd782c34..8f25e5e1a 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 = FALSE)

+function &DB($params = '', $active_record_override = FALSE)

 {

 	// Load the DB config file if a DSN string wasn't passed

 	if (is_string($params) AND strpos($params, '://') === FALSE)

@@ -58,14 +58,14 @@ function &DB($params = '', $active_record = 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 == TRUE)

+	if ($active_record_override == TRUE)

 	{

-		$params['active_r'] = TRUE;

+		$active_record = TRUE;

 	}

 	

 	require_once(BASEPATH.'database/DB_driver'.EXT);

 

-	if ( ! isset($params['active_r']) OR $params['active_r'] == TRUE)

+	if ($active_record == TRUE)

 	{

 		require_once(BASEPATH.'database/DB_active_rec'.EXT);