From 38ce0c9d445c0187115267c0d86db62df4849f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sun, 28 Aug 2016 10:29:10 +0200
Subject: [PATCH] Remove unused paramenter when connecting to MySQLi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12502

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                   |  1 +
 libraries/dbi/DBIMysqli.php | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77b2c1f9e4..79fa66e378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - issue #12477 Add checking missing elements and confirming element types from json_decode
 - issue #12251 Automatically save SQL query in browser local storage rather than in cookie
 - issue #12292 Unable to edit transformations
+- issue #12502 Remove unused paramenter when connecting to MySQLi
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index 0b98c85218..f310d9c85b 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -64,7 +64,6 @@ class DBIMysqli implements DBIExtension
      * @param string $host          mysql hostname
      * @param string $user          mysql user name
      * @param string $password      mysql user password
-     * @param string $dbname        database name
      * @param int    $server_port   server port
      * @param string $server_socket server socket
      * @param int    $client_flags  client flags of connection
@@ -73,7 +72,7 @@ class DBIMysqli implements DBIExtension
      * @return bool
      */
     private function _realConnect(
-        $link, $host, $user, $password, $dbname, $server_port,
+        $link, $host, $user, $password, $server_port,
         $server_socket, $client_flags = null, $persistent = false
     ) {
         global $cfg;
@@ -89,7 +88,7 @@ class DBIMysqli implements DBIExtension
                 $host,
                 $user,
                 $password,
-                $dbname,
+                '',
                 $server_port,
                 $server_socket
             );
@@ -99,7 +98,7 @@ class DBIMysqli implements DBIExtension
                 $host,
                 $user,
                 $password,
-                $dbname,
+                '',
                 $server_port,
                 $server_socket,
                 $client_flags
@@ -185,7 +184,6 @@ class DBIMysqli implements DBIExtension
                 $cfg['Server']['host'],
                 $user,
                 $password,
-                false,
                 $server_port,
                 $server_socket,
                 $client_flags
@@ -201,7 +199,6 @@ class DBIMysqli implements DBIExtension
                     $cfg['Server']['host'],
                     $user,
                     '',
-                    false,
                     $server_port,
                     $server_socket,
                     $client_flags
@@ -213,7 +210,6 @@ class DBIMysqli implements DBIExtension
                 $server['host'],
                 $user,
                 $password,
-                false,
                 $server_port,
                 $server_socket
             );