summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-11-10 22:07:13 +0100
committerGreg Aker <greg.aker@ellislab.com>2010-11-10 22:07:13 +0100
commit579fde36e4f8cc294edec4fd4eefe06f4df09dda (patch)
tree4d3e9c8d65afb065eab738783b8361004754729d /system/database
parent58fdee85181b05c7303b1d2a5a26cb2f4e00f03f (diff)
parentc0af6c044570e0561afdea109f4101dba04e2510 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index b51995b68..60a67e821 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -130,7 +130,7 @@ function &DB($params = '', $active_record_override = NULL)
// Instantiate the DB adapter
$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
- $DB =& instantiate_class(new $driver($params));
+ $DB = new $driver($params);
if ($DB->autoinit == TRUE)
{