diff --git a/ChangeLog b/ChangeLog index 0dd35d95f2..7f781a2117 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4427 Action icons not in horizontal order - bug #4493 s_attention.png is missing - bug #4499 Uncaught TypeError: Cannot call method 'substr' of undefined +- bug #4498 PMA 4.2.x and HHVM 4.2.6.0 (2014-07-17) - bug #4471 Undefined index warning with referenced column. diff --git a/libraries/dbi/DBIMysqli.class.php b/libraries/dbi/DBIMysqli.class.php index 15574048c6..73ea82af1b 100644 --- a/libraries/dbi/DBIMysqli.class.php +++ b/libraries/dbi/DBIMysqli.class.php @@ -135,7 +135,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension if ($server) { $server_port = (empty($server['port'])) - ? false + ? null : (int)$server['port']; $server_socket = (empty($server['socket'])) ? '' @@ -145,7 +145,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension : $server['host']; } else { $server_port = (empty($cfg['Server']['port'])) - ? false + ? null : (int) $cfg['Server']['port']; $server_socket = (empty($cfg['Server']['socket'])) ? null