diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-01-30 21:26:25 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-01-30 21:26:25 +0100 |
| commit | 75d568db823b8fe7526e416f5e3f1c2c235f5473 (patch) | |
| tree | b2e37d724cbdc56c345a2e7306539870c5c76c88 /system/database/DB.php | |
| parent | f653a2fe2f82130ff9d8db6a4913b4823dd81424 (diff) | |
removed 'active_r' db config variable, replaced with global $active_record setting. (bug report #1834)
Diffstat (limited to 'system/database/DB.php')
| -rw-r--r-- | system/database/DB.php | 8 |
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);
|