diff options
author | Andrey Andreev <narf@devilix.net> | 2015-12-08 12:25:19 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2015-12-08 12:25:19 +0100 |
commit | 2410c30c457e108c1f57978df610e82abab0361e (patch) | |
tree | 34f858d9fa5c0e63eb3b08ab10afce8a36779e35 /system/database/DB.php | |
parent | b1cde1fdd77aec1278dd2b4d6ae071e814a58c2a (diff) |
Remove CI_DB_driver::load_rdriver()
Diffstat (limited to 'system/database/DB.php')
-rw-r--r-- | system/database/DB.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/database/DB.php b/system/database/DB.php index 23de414b5..355d26fb5 100644 --- a/system/database/DB.php +++ b/system/database/DB.php @@ -192,10 +192,13 @@ function &DB($params = '', $query_builder_override = NULL) // Load the DB driver $driver_file = BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_driver.php'; - file_exists($driver_file) OR show_error('Invalid DB driver'); require_once($driver_file); + // Load the result classes as well + require_once(BASEPATH.'database/DB_result.php'); + require_once(BASEPATH.'database/drivers/'.$params['dbdriver'].'/'.$params['dbdriver'].'_result.php'); + // Instantiate the DB adapter $driver = 'CI_DB_'.$params['dbdriver'].'_driver'; $DB = new $driver($params); |