diff --git a/server_privileges.php b/server_privileges.php
index 7433c46270..a184682310 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -134,12 +134,11 @@ $random_n = mt_rand(0,1000000); // a random number that will be appended to the
  * no escaping (for example test_db) but in mysql.db you'll see test\_db
  * for a db-specific privilege.
  *
- * @param   string   $db_and_table
- * @param   string   $dbname
- * @param   string   $tablename
- * @return  string   the escaped (if necessary) $db_and_table
+ * @param string $dbname       Database name
+ * @param string $tablename    Table name
+ * @return string the escaped (if necessary) database.table
  */
-function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) {
+function PMA_wildcardEscapeForGrant($dbname, $tablename) {
 
     if (! strlen($dbname)) {
         $db_and_table = '*.*';
@@ -1106,7 +1105,7 @@ if (isset($_REQUEST['change_copy'])) {
  * Updates privileges
  */
 if (!empty($update_privs)) {
-    $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, (isset($tablename) ? $tablename : ''));
+    $db_and_table = PMA_wildcardEscapeForGrant($dbname, (isset($tablename) ? $tablename : ''));
 
     $sql_query0 =
         'REVOKE ALL PRIVILEGES ON ' . $db_and_table
@@ -1182,7 +1181,7 @@ if (!empty($update_privs)) {
  * Revokes Privileges
  */
 if (isset($_REQUEST['revokeall'])) {
-    $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname, isset($tablename) ? $tablename : '');
+    $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ? $tablename : '');
 
     $sql_query0 =
         'REVOKE ALL PRIVILEGES ON ' . $db_and_table