summaryrefslogtreecommitdiffstats
path: root/system/libraries/Controller.php
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-09-30 01:26:28 +0200
committeradmin <devnull@localhost>2006-09-30 01:26:28 +0200
commit3ed8c51254a5b26d951fa675802fcf69adf9638e (patch)
tree8e5f5af90a7e73f4b1a55f78fa3542f5cb156cfa /system/libraries/Controller.php
parent051402b4c281cf125c9b369b682128aaefb587cd (diff)
Diffstat (limited to 'system/libraries/Controller.php')
-rw-r--r--system/libraries/Controller.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index be66b19b7..51f455023 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -189,8 +189,6 @@ class Controller extends CI_Base {
}
$remap = array(
- 'DB_export' => 'dbexport',
- 'DB_utility' => 'dbutility',
'Unit_test' => 'unit'
);
@@ -516,19 +514,15 @@ class Controller extends CI_Base {
{
if ( ! $this->_ci_is_loaded('db'))
{
- $this->_init_database();
+ $this->_ci_init_database();
}
if ($class == 'dbutil')
{
require_once(BASEPATH.'database/DB_utility'.EXT);
require_once(BASEPATH.'database/drivers/'.$this->db->dbdriver.'/'.$this->db->dbdriver.'_utility'.EXT);
- $this->init_class('CI_DB_'.$this->db->dbdriver.'_utility', 'dbutil');
- }
- elseif ($class == 'dbexport')
- {
- require_once(BASEPATH.'database/DB_export'.EXT);
- $this->init_class('CI_DB_export', 'dbexport');
+ $class = 'CI_DB_'.$this->db->dbdriver.'_utility';
+ $this->dbutil = new $class();
}
}