From f43517efb525b8e4cfc387822308c206f32ba6ee Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 19:37:51 +0200 Subject: [PATCH] mysql extension - remove 'persistent' parameter Was named 'persistant' and never used/documented --- libraries/dbi/mysql.dbi.lib.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index a175aaeb91..292dfffa7b 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -30,7 +30,7 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { * @param boolean $persistent * @return mixed false on error or a mysql connection resource on success */ -function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent=false) +function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent = false) { global $cfg; @@ -72,9 +72,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $server_socket = (empty($server['socket'])) ? '' : ':' . $server['socket']; - $server_persistent = (empty($server['persistent'])) - ? false - : true; } else { $server_port = (empty($cfg['Server']['port'])) ? '' @@ -110,9 +107,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistent); + $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL); } else { - $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistent); + $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL); } } if (empty($link)) { -- 2.11.4.GIT