From c93b7dfdd52aab45a65d52070a86fd0fb0fd6067 Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Sun, 11 Aug 2013 09:55:11 +0800
Subject: [PATCH] remove unneeded parameter and return values

---
 libraries/server_privileges.lib.php | 10 ++++------
 server_privileges.php               |  5 +----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0a0c1394f9..0ef8679eca 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3053,11 +3053,9 @@ function PMA_updatePrivileges($username, $hostname, $tablename, $dbname)
 /**
  * Get List of information: Changes / copies a user
  *
- * @param string $Password Recent MySQL versions Password
- *
  * @return array()
  */
-function PMA_getDataForChangeOrCopyUser($Password)
+function PMA_getDataForChangeOrCopyUser()
 {
     $row = null;
     $queries = null;
@@ -3089,7 +3087,7 @@ function PMA_getDataForChangeOrCopyUser($Password)
         }
     }
     
-    return array($row, $queries, $password);
+    return array($queries, $password);
 }
 
 /**
@@ -3334,8 +3332,8 @@ function PMA_getDataForDBInfo()
     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,
+        $db_and_table,
+        $dbname_is_wildcard,
     );
 }
 
diff --git a/server_privileges.php b/server_privileges.php
index 185699dd97..675fe8cf31 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -137,10 +137,7 @@ if (! $is_superuser) {
 /**
  * Changes / copies a user, part I
  */
-list($row, $queries, $password) 
-    = PMA_getDataForChangeOrCopyUser(
-        isset($Password)? $Password : null
-    );
+list($queries, $password) = PMA_getDataForChangeOrCopyUser();
     
 /**
  * Adds a user