From: stronk7 Date: Sat, 13 Jan 2007 01:20:10 +0000 (+0000) Subject: Now environment stuff uses $CFG->dbfamily X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ed7656bf013d116a1b32ece1adb4e7ed87241dfb;p=moodle.git Now environment stuff uses $CFG->dbfamily --- diff --git a/lib/environmentlib.php b/lib/environmentlib.php index 179ed66173..4c961e492b 100644 --- a/lib/environmentlib.php +++ b/lib/environmentlib.php @@ -658,16 +658,8 @@ function environment_check_database($version) { } /// Now search the version we are using (depending of vendor) - $current_vendor = $db->databaseType; - if ($current_vendor == 'mysqli') { //Normalize a bit mysql - $current_vendor ='mysql'; - } - if ($current_vendor == 'postgres7') { //Normalize a bit postgresql - $current_vendor ='postgres'; - } - if ($current_vendor == 'oci8po') { //Normalize a bit oracle - $current_vendor ='oracle'; - } + $current_vendor = set_dbfamily(); + $dbinfo = $db->ServerInfo(); $current_version = normalize_version($dbinfo['version']); $needed_version = $vendors[$current_vendor];