bug 818654

This commit is contained in:
Marc Delisle
2004-02-11 14:30:04 +00:00
parent 3168d1aada
commit 9c949b15db
2 changed files with 9 additions and 0 deletions

View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-02-11 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: bug 818654, password not copied
2004-02-08 Marc Delisle <lem9@users.sourceforge.net> 2004-02-08 Marc Delisle <lem9@users.sourceforge.net>
* lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza). * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
* lang/norwegian: Updated, thanks to Sven-Erik Andersen (sven-erik). * lang/norwegian: Updated, thanks to Sven-Erik Andersen (sven-erik).

View File

@@ -545,6 +545,12 @@ if (!empty($change_copy)) {
} else { } else {
$row = PMA_DBI_fetch_assoc($res); $row = PMA_DBI_fetch_assoc($res);
extract($row, EXTR_OVERWRITE); extract($row, EXTR_OVERWRITE);
// Recent MySQL versions have the field "Password" in mysql.user,
// so the previous extract creates $Password but this script
// uses $password
if (!isset($password) && isset($Password)) {
$password=$Password;
}
PMA_DBI_free_result($res); PMA_DBI_free_result($res);
$queries = array(); $queries = array();
} }