Force the database connection to use to avoid a couple of problems seen in internal testing

git-svn-id: file:///svn/phpbb/trunk@6137 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-07-02 19:33:28 +00:00
parent 4c457ecc92
commit fdd82e4c12

View file

@ -1691,7 +1691,7 @@ class install_install extends module
switch ($dbms) switch ($dbms)
{ {
case 'mysql4': case 'mysql4':
if (version_compare(mysql_get_server_info(), '4.0.0', '<')) if (version_compare(mysql_get_server_info($db->db_connect_id), '4.0.0', '<'))
{ {
$error[] = $lang['INST_ERR_DB_NO_MYSQL4']; $error[] = $lang['INST_ERR_DB_NO_MYSQL4'];
} }
@ -1699,7 +1699,7 @@ class install_install extends module
break; break;
case 'mysqli': case 'mysqli':
if (version_compare(mysqli_get_server_info(), '4.1.3', '<')) if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<'))
{ {
$error[] = $lang['INST_ERR_DB_NO_MYSQLI']; $error[] = $lang['INST_ERR_DB_NO_MYSQLI'];
} }