From bed74cef3694910e73bf0b73d0d6328a2ac5fdbf Mon Sep 17 00:00:00 2001
From: Sharktooth <sharx1976@users.sf.net>
Date: Wed, 30 Jul 2014 08:31:49 -0400
Subject: [PATCH 1/2] bug #4498 PMA 4.2.x and HHVM

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/dbi/DBIMysqli.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From c66aa5c806d71cbeb1a56458560ccaf617324056 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 30 Jul 2014 08:32:41 -0400
Subject: [PATCH 2/2] ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

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.