[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6129-gfd65dcd

[Marc Delisle]

The branch, master has been updated
       via  fd65dcdcd147d9a866025c6894b3b994014f63eb (commit)
       via  d42dab9dd48e337f9b4e8f59f16e04db908ce5e8 (commit)
       via  158517d7644b83459dc67210e66c0c8b96c3d4cd (commit)
      from  d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 (commit)


- Log -----------------------------------------------------------------
commit fd65dcdcd147d9a866025c6894b3b994014f63eb
Merge: d46bb6d87767ae7e9da1e4182f95ba1d885e26e9 d42dab9dd48e337f9b4e8f59f16e04db908ce5e8
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Aug 5 13:00:24 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

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 4242ca5..43dc0d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,8 @@ $Id$
   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 ad6d545..b5915df 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -109,9 +109,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