[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5-14-gd42dab9

The branch, QA_3_3 has been updated via d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 (commit) via 158517d7644b83459dc67210e66c0c8b96c3d4cd (commit) from fd1d214d35270f881ae4a12555b1a0f467e2381a (commit) - Log ----------------------------------------------------------------- commit d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Aug 5 12:22:56 2010 -0400 patch #3039269 [dbi] Wrong variable checked for nopassword option commit 158517d7644b83459dc67210e66c0c8b96c3d4cd Author: Will Palmer <wmpalmer(a)gmail.com> Date: Wed Aug 4 09:32:58 2010 +0100 bug [mysqli] non-global $cfg referenced where $GLOBAL['cfg'] expected ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/dbi/mysqli.dbi.lib.php | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b570447..ab33f1f 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 diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 913bce6..f3bcf26 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 { hooks/post-receive -- phpMyAdmin