summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 22:01:24 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 22:01:24 +0100
commitfa67d54da36ae7a210e995d80a5273f0bc0d7ea0 (patch)
treee36f9a6124ff38b321de830877ae96459d3aee52 /system/database
parent146278b4cc40fd6468c0c800e00ac375cf282207 (diff)
parent585600207a79c1d9a7b0af5883bf384629b753a3 (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)
{