bug #979596

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cae3d57d6..79c7ee98ba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ $Source$
 2004-06-25 Alexander M. Turek  <rabus@users.sourceforge.net>
     * queryframe.php: Undefined index errors.
     * footer.inc.php: bug #979610.
+    * server_privileges.php: bug #979596 (granting privileges doesn't take
+      wildcards in account).
 
 2004-06-24 Marc Delisle  <lem9@users.sourceforge.net>
     * left.php, config.inc.php, Documentation.html,
diff --git a/server_privileges.php b/server_privileges.php
index 247aee5b41..2bf98c388c 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1172,7 +1172,7 @@ if (empty($adduser) && empty($checkprivs)) {
                 $res = PMA_DBI_query('SHOW DATABASES;');
                 $pred_db_array = array();
                 while ($row = PMA_DBI_fetch_row($res)) {
-                    if (!isset($found_rows) || !in_array($row[0], $found_rows)) {
+                    if (!isset($found_rows) || !in_array(str_replace('_', '\\_', $row[0]), $found_rows)) {
                         $pred_db_array[] = $row[0];
                     }
                 }
@@ -1183,7 +1183,7 @@ if (empty($adduser) && empty($checkprivs)) {
                     echo '                        <select name="pred_dbname" onchange="this.form.submit();">' . "\n"
                        . '                            <option value="" selected="selected">' . $strUseTextField . ':</option>' . "\n";
                     foreach ($pred_db_array as $current_db) {
-                        echo '                            <option value="' . htmlspecialchars($current_db) . '">' . htmlspecialchars($current_db) . '</option>' . "\n";
+                        echo '                            <option value="' . htmlspecialchars(str_replace('_', '\\_', $current_db)) . '">' . htmlspecialchars($current_db) . '</option>' . "\n";
                     }
                     echo '                        </select>' . "\n";
                 }