From 03cd0bdc14ac5ab7012ee05e25591a9141677d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 10 Oct 2002 11:04:45 +0000
Subject: [PATCH] fix bug #620624 - displaying password from config when MySQL
 connection can't be established

---
 ChangeLog                           | 4 ++++
 libraries/auth/config.auth.lib.php3 | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6727ecd82..617c56f37e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-10-10 Michal Cihar  <nijel@users.sourceforge.net>
+    * libraries/auth/config.auth.lib.php3: bug #620624 - displaying password
+      from config when MySQL connection can't be established
+    
 2002-10-09 Loïc Chapeaux  <lolo@phpheaven.net>
     * libraries/display_tbl.lib.php3, bug 619735: display broken (bad HTML)
 
diff --git a/libraries/auth/config.auth.lib.php3 b/libraries/auth/config.auth.lib.php3
index 8b61233adc..f19fd22fee 100644
--- a/libraries/auth/config.auth.lib.php3
+++ b/libraries/auth/config.auth.lib.php3
@@ -81,10 +81,15 @@ if (!defined('PMA_CONFIG_AUTH_INCLUDED')) {
         } else {
             $conn_error = 'Cannot connect: invalid settings.';
         }
-        $local_query    = $connect_func . '('
+/* Commented out by Nijel: This causes displaying login and password from
+ * config when connection to MySQL server can't be established. (SQL parser
+ * fails on this and then displays it as wrong SQL.
+ */
+/*      $local_query    = $connect_func . '('
                         . $cfg['Server']['host'] . $server_port . $server_socket . ', '
                         . $cfg['Server']['user'] . ', '
-                        . $cfg['Server']['password'] . ')';
+                        . $cfg['Server']['password'] . ')';*/
+        $local_query 	= '';
 
         // Defines the charset to be used
         header('Content-Type: text/html; charset=' . $GLOBALS['charset']);