diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index ee9c850a83..590c3b4b61 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3269,18 +3269,20 @@ function PMA_updateDataForAddUser(
 /**
  * Update DB information: DB, Table, isWildcard
  *
- * @param string &$dbname             database name
- * @param string &$tablename          table name
- * @param string &$db_and_table       db_and_table
- * @param bool   &$dbname_is_wildcard is Wild card
- * @param string &$pred_dbname        Pre database name
+ * @param string $dbname             database name
+ * @param string $tablename          table name
+ * @param string $db_and_table       db_and_table
+ * @param bool   $dbname_is_wildcard is Wild card
  *
- * @return null
+ * @return array
  */
 function PMA_updateDataForDBInfo(
-    &$dbname, &$tablename, &$db_and_table, 
-    &$dbname_is_wildcard, &$pred_dbname
 ) {
+    $dbname = null;
+    $tablename = null;
+    $db_and_table = null;
+    $dbname_is_wildcard = null;
+    
     /**
      * Checks if a dropdown box has been used for selecting a database / table
      */
@@ -3323,6 +3325,13 @@ function PMA_updateDataForDBInfo(
             $dbname_is_wildcard = false;
         }
     }
+    
+    return array(
+        isset($dbname)? $dbname : null, 
+        isset($tablename)? $tablename : null,
+        isset($db_and_table)? $db_and_table : null,
+        isset($dbname_is_wildcard)? $dbname_is_wildcard : null,
+    );
 }
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index 19d9e87aac..d4e54a1442 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -122,15 +122,9 @@ $strPrivDescUsage = __('No privileges.');
 /**
  * Get DB information: dbname, tablename, db_and_table, dbname_is_wildcard
  */
-$dbname = isset($dbname)? $dbname : null; 
-$tablename = isset($tablename)? $tablename : null; 
-$db_and_table = isset($db_and_table)? $db_and_table : null; 
-$dbname_is_wildcard = isset($dbname_is_wildcard)? $dbname_is_wildcard : null; 
-$pred_dbname = isset($pred_dbname)? $pred_dbname : null; 
 
-PMA_updateDataForDBInfo(
-    $dbname, $tablename, $db_and_table, $dbname_is_wildcard, $pred_dbname
-);
+list($dbname, $tablename, $db_and_table, $dbname_is_wildcard) 
+    = PMA_updateDataForDBInfo();
 
 /**
  * Checks if the user is allowed to do what he tries to...