diff --git a/upload/install/include/install_function.php b/upload/install/include/install_function.php index 5c9adab6aadb7eb9c4922ab8935ede75a0a23427..5114570257d6fb29725b7b4df2e8979d95e76fe5 100644 --- a/upload/install/include/install_function.php +++ b/upload/install/include/install_function.php @@ -64,9 +64,9 @@ function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) { } $mysqlmode = function_exists('mysql_connect') ? 'mysql' : 'mysqli'; $link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw); - if(!$link) { - $errno = ($mysqlmode == 'mysql') ? mysql_errno() : mysqli_errno(); - $error = ($mysqlmode == 'mysql') ? mysql_error() : mysqli_error(); + if(($mysqlmode == 'mysql' && !$link) || ($mysqlmode != 'mysql' && $link->connect_errno)) { + $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->connect_errno; + $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->connect_error; if($errno == 1045) { show_msg('database_errno_1045', $error, 0); } elseif($errno == 2003) { diff --git a/upload/install/index.php b/upload/install/index.php index 1cb9e7b1434e284b421a81c5289bccc63f23712c..2b575f4c52896ddc21e9b7fc5219193810b7f000 100644 --- a/upload/install/index.php +++ b/upload/install/index.php @@ -285,9 +285,9 @@ if($method == 'show_license') { } else { $mysqlmode = function_exists("mysql_connect") ? 'mysql' : 'mysqli'; $link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw); - if(!$link) { - $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->errno; - $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->error; + if(($mysqlmode == 'mysql' && !$link) || ($mysqlmode != 'mysql' && $link->connect_errno)) { + $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->connect_errno; + $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->connect_error; if($errno == 1045) { show_msg('database_errno_1045', $error, 0); } elseif($errno == 2003) { diff --git a/upload/uc_server/install/func.inc.php b/upload/uc_server/install/func.inc.php index 24204f578a1914885eafcde625a30f1817e60a6c..dfd8aa7c50141329d8fd9dd3d872480d97aa81de 100644 --- a/upload/uc_server/install/func.inc.php +++ b/upload/uc_server/install/func.inc.php @@ -64,9 +64,9 @@ function check_db($dbhost, $dbuser, $dbpw, $dbname, $tablepre) { } $mysqlmode = function_exists('mysql_connect') ? 'mysql' : 'mysqli'; $link = ($mysqlmode == 'mysql') ? @mysql_connect($dbhost, $dbuser, $dbpw) : new mysqli($dbhost, $dbuser, $dbpw); - if(!$link) { - $errno = ($mysqlmode == 'mysql') ? mysql_errno() : mysqli_errno(); - $error = ($mysqlmode == 'mysql') ? mysql_error() : mysqli_error(); + if(($mysqlmode == 'mysql' && !$link) || ($mysqlmode != 'mysql' && $link->connect_errno)) { + $errno = ($mysqlmode == 'mysql') ? mysql_errno($link) : $link->connect_errno; + $error = ($mysqlmode == 'mysql') ? mysql_error($link) : $link->connect_error; if($errno == 1045) { show_msg('database_errno_1045', $error, 0); } elseif($errno == 2003) {