summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-07 05:16:32 +0200
committeradmin <devnull@localhost>2006-10-07 05:16:32 +0200
commit88a8ad187b13b36d6120eae2344fe16c3a76219d (patch)
tree9707b986ae9fe37f226abd5fec76b58d15903858 /system/database/DB.php
parent81ccb439c2743776728b798bdc7e31db3d826233 (diff)
Diffstat (limited to 'system/database/DB.php')
-rw-r--r--system/database/DB.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index f7476a68e..62237440f 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -24,8 +24,6 @@
*/
function DB($params = '', $return = FALSE, $active_record = FALSE)
{
- $obj =& get_instance();
-
// Do we even need to load the database class?
if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE)
{
@@ -92,8 +90,9 @@ function DB($params = '', $return = FALSE, $active_record = FALSE)
{
return $DB;
}
-
- $obj->db =& $DB;
+
+ $CI =& get_instance();
+ $CI->db =& $DB;
}