fix bug #620624 - displaying password from config when MySQL connection can't be established

This commit is contained in:
Michal Čihař 2002-10-10 11:04:45 +00:00
parent 2caebfab9e
commit 03cd0bdc14
2 changed files with 11 additions and 2 deletions

View File

@ -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)

View File

@ -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']);