diff --git a/ChangeLog b/ChangeLog index e0ac4f1bb..20b56ca6e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-09-28 Alexander M. Turek + * libraries/dbi/mysql.dbi.php: Compatibility fix for php < 4.3 + (bug #1033360), thanks to Claude Theroux. + 2004-09-27 Marc Delisle ### 2.6.0 released diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index ec06fea1a..6bffb7fac 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -47,7 +47,7 @@ function PMA_DBI_connect($user, $password) { ? '' : ':' . $cfg['Server']['socket']; - if (PMA_MYSQL_CLIENT_API >= 32349) { + if (PMA_PHP_INT_VERSION >= 40300 && PMA_MYSQL_CLIENT_API >= 32349) { $client_flags = $cfg['Server']['compress'] && defined('MYSQL_CLIENT_COMPRESS') ? MYSQL_CLIENT_COMPRESS : 0; // always use CLIENT_LOCAL_FILES as defined in mysql_com.h // for the case where the client library was not compiled