diff --git a/ChangeLog b/ChangeLog index 370689e64..c8a509a88 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $Source$ 2004-02-29 Alexander M. Turek * tbl_select.php: Fixed bug #887505 (PMA does not add MySQL charsets to WHERE clauses). + * libraries/dbi/mysql.dbi.lib.php: Yet another ungly fix concerning the + missing mysql_get_client_info() function. 2004-02-27 Michal Cihar * config.inc.php, libraries/config_import.lib.php, diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index c58624ba2..3511e03ae 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -23,9 +23,13 @@ if (!@function_exists('mysql_connect')) { // MySQL client API if (!defined('PMA_MYSQL_CLIENT_API')) { - $client_api = explode('.', mysql_get_client_info()); - define('PMA_MYSQL_CLIENT_API', (int)sprintf('%d%02d%02d', $client_api[0], $client_api[1], intval($client_api[2]))); - unset($client_api); + if (function_exists('mysql_get_client_info')) { + $client_api = explode('.', mysql_get_client_info()); + define('PMA_MYSQL_CLIENT_API', (int)sprintf('%d%02d%02d', $client_api[0], $client_api[1], intval($client_api[2]))); + unset($client_api); + } else { + define('PMA_MYSQL_CLIENT_API', 32332); // always expect the worst... + } } function PMA_DBI_connect($user, $password) {