From 158517d7644b83459dc67210e66c0c8b96c3d4cd Mon Sep 17 00:00:00 2001 From: Will Palmer Date: Wed, 4 Aug 2010 09:32:58 +0100 Subject: [PATCH 1/2] bug [mysqli] non-global $cfg referenced where $GLOBAL['cfg'] expected --- libraries/dbi/mysqli.dbi.lib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce627..f3bcf268c 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -110,9 +110,8 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu if (!$server) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); - // Retry with empty password if we're allowed to - if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { + if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { From d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Aug 2010 12:22:56 -0400 Subject: [PATCH 2/2] patch #3039269 [dbi] Wrong variable checked for nopassword option --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index b5704473c..ab33f1fa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA them to string. - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request - bug #3036132 [core] Triggers not fetched if dbname has an hyphen +- patch #3039269 [dbi] Wrong variable checked for nopassword option, + thanks to Will Palmer - wpalmer 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of