From b317fe156ab2c863af4f9f42cefa7752249411aa Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 24 Jan 2016 12:02:10 -0800
Subject: [PATCH] Support PHP 7

---
 adminer/drivers/mysql.inc.php   | 6 +++---
 adminer/include/version.inc.php | 2 +-
 changes.txt                     | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 51aa4072..98e7bf1b 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -13,16 +13,16 @@ if (!defined("DRIVER")) {
 				parent::init();
 			}
 
-			function connect($server, $username, $password) {
+			function connect($server = "", $username = "", $password = "", $database = null, $port = null, $socket = null) {
 				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
 					($server . $username . $password != "" ? $password : ini_get("mysqli.default_pw")),
-					null,
+					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
-					(!is_numeric($port) ? $port : null)
+					(!is_numeric($port) ? $port : $socket)
 				);
 				return $return;
 			}
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 54f5cd44..a3a79bb2 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.2.3";
+$VERSION = "4.2.4-dev";
diff --git a/changes.txt b/changes.txt
index d9f7286f..e3faec26 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.2.4-dev:
+MySQL: Support PHP 7
+
 Adminer 4.2.3 (released 2015-11-15):
 Fix XSS in indexes (non-MySQL only)
 Support PHP 7