From aeaa595dfa351bfc154927b557b8cb99fbb2025a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 27 Jun 2001 14:40:42 +0000
Subject: [PATCH] bug 434608

---
 ChangeLog         | 3 ++-
 user_details.php3 | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50cf3d936..f5581d1cf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ $Source$
 
 2001-06-27  Marc Delisle  <lem9@users.sourceforge.net>
 	* bug 434608: support db names with special characters (MySQL >= 3.23.6)
-
+	(lib.inc.php3, db_create.php3, db_details.php3, tbl_addfield.php3,
+	 tbl_alter.php3, user_details.php3 (incomplete))
 
 2001-06-27  Steve Alberty  <alberty@neptunlabs.de>
 	* lib.inc.php3: speedup get_table_content for tbl_dump
diff --git a/user_details.php3 b/user_details.php3
index bab87a03b..acc409655 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -278,7 +278,7 @@ function grant_operations()
 <?php
     if (isset($dbgrant)) {
         if (!isset($tablegrant)) echo "<option selected></option>";
-        $result = mysql_query("SHOW TABLES from $dbgrant");
+        $result = mysql_query("SHOW TABLES from ".db_name($dbgrant));
         if (@mysql_num_rows($result))
            while ($row = mysql_fetch_row($result)) {
                 $selected = ($row[0] == $tablegrant)? "SELECTED" : "";
@@ -298,7 +298,7 @@ function grant_operations()
 <?php
 
     if (isset($dbgrant) && isset($tablegrant)) {
-       $result = mysql_query("SHOW COLUMNS FROM $dbgrant.$tablegrant");
+       $result = mysql_query("SHOW COLUMNS FROM ".db_name($dbgrant).".$tablegrant");
        if (@mysql_num_rows($result))
            while ($row = mysql_fetch_row($result))
                echo "<option>" . $row[0] . "</option>\n";
@@ -400,14 +400,15 @@ function table_grants($host, $user, $dbcheck = false)
         # Revoke
         $query = "server=$server&lang=$lang&db=mysql&table=user";
         $revoke_url  = "sql.php3";
-        $revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON $db.$table FROM '$user'@'$host'");
+        $revoke_url .= "?sql_query=".urlencode("REVOKE $priv ON ".db_name($db).".$table FROM '$user'@'$host'");
         $revoke_url .= "&$query";
         $revoke_url .= "&zero_rows=" . urlencode("$strRevokeMessage <font color=#002E80>$user@$host</font>");
         $revoke_url .= "&goto=$self";
 
         # Revoke GRANT OPTION
         $revoke_grant_url  = "sql.php3";
-        $revoke_grant_url .= "?sql_query=".urlencode("REVOKE GRANT OPTION ON $db.$table FROM '$user'@'$host'");
+        $revoke_grant_url .= "?sql_query="
+	 .urlencode("REVOKE GRANT OPTION ON ".db_name($db).".$table FROM '$user'@'$host'");
         $revoke_grant_url .= "&$query";
         $revoke_grant_url .= "&zero_rows=" . urlencode("$strRevokeGrantMessage <font color=#002E80>$user@$host</font>");
         $revoke_grant_url .= "&goto=$self";