Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xChangeLog3
-rw-r--r--server_privileges.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index be9ccff15e..68a6477529 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2005-11-01 Marc Delisle <lem9@users.sourceforge.net>
+ * server_privileges.php: undefined variable when changing a password
+
2005-11-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php:
bug #1342332 Error messages wrongly formatted.
diff --git a/server_privileges.php b/server_privileges.php
index ffcbfa1d62..6cfc86241d 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1557,9 +1557,9 @@ if (empty($adduser) && empty($checkprivs)) {
PMA_displayPrivTable((empty($dbname) ? '*' : $dbname), ((empty($dbname) || empty($tablename)) ? '*' : $tablename), TRUE, 3);
echo '</form>' . "\n";
- if ( empty( $tablename ) && ! $dbname_is_wildcard ) {
+ if ( empty( $tablename ) && isset($dbname_is_wildcard) && ! $dbname_is_wildcard ) {
- // na table name was given, display all table specific rights
+ // no table name was given, display all table specific rights
// but only if $dbname contains no wildcards
// table header