diff --git a/ChangeLog b/ChangeLog index ac3e7eafd6..5ba137c343 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,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 8ff31ba228..a8dc61441c 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 @@ -175,7 +174,6 @@ class DBIMysqli implements DBIExtension $server['host'], $user, $password, - false, $server['port'], $server['socket'] );