[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4628-g5dfe98a

[Marc Delisle]

The branch, master has been updated
       via  5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (commit)
       via  5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit)
      from  345f6d21d09c727980630a460251beb86f84170f (commit)


- Log -----------------------------------------------------------------
commit 5dfe98a3786c7aaf55c9dd677da81bfe509c8612
Merge: 345f6d21d09c727980630a460251beb86f84170f 5d525e89ebc32eb19fc6266b96988d8df0d22ff4
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 2 12:37:19 2010 -0400

    bug [privileges] List of tables not shown when the db name has a wildcard

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    1 +
 server_privileges.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e186f92..1c34496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@ $Id$
 - bug #2986383 [parser] Not all data being shown / counted
 - bug [synchronize] Rows were deleted in target table regardless of the
   "Would you like to delete..." option
+- bug [privileges] List of tables not shown when the db name has a wildcard
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/server_privileges.php b/server_privileges.php
index 3340206..87c71b8 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1905,7 +1905,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             } else {
                 echo '    <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n"
                    . '    <label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n";
-                if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($dbname) . ';', null, PMA_DBI_QUERY_STORE)) {
+                if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) {
                     $pred_tbl_array = array();
                     while ($row = PMA_DBI_fetch_row($res)) {
                         if (!isset($found_rows) || !in_array($row[0], $found_rows)) {


hooks/post-receive
-- 
phpMyAdmin