From 6ec2e514b6cc2b740aada33a33998ed8a4a161a5 Mon Sep 17 00:00:00 2001
From: Thilina Buddika <thilinaabeyrathna@gmail.com>
Date: Wed, 18 Jul 2012 08:32:52 +0530
Subject: [PATCH] remove global variable pma_pw2

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

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1d1166fa5d..db63aa1f30 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1240,25 +1240,22 @@ function PMA_getGrants($user, $host)
 
 /**
  * Update password and get message for password updating
- * 
- * @param string $pma_pw    password that user entered for change, comming from request
- * @param string $pma_pw2   Re typed password, comming from request
+ *
  * @param string $err_url   error url
  * @param string $username  username
  * @param string $hostname  hostname
  * 
  * @return string $message  success or error message after updating password
  */
-function PMA_getMessageForUpdatePassword($pma_pw2, $err_url
-    , $username, $hostname
-) {
+function PMA_getMessageForUpdatePassword($err_url, $username, $hostname)
+{
     // similar logic in user_password.php
     $message = '';
     
-    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($pma_pw2)) {
-        if ($_POST['pma_pw'] != $pma_pw2) {
+    if (empty($_REQUEST['nopass']) && isset($_POST['pma_pw']) && isset($_POST['pma_pw2'])) {
+        if ($_POST['pma_pw'] != $_POST['pma_pw2']) {
             $message = PMA_Message::error(__('The passwords aren\'t the same!'));
-        } elseif (empty($_POST['pma_pw']) || empty($pma_pw2)) {
+        } elseif (empty($_POST['pma_pw']) || empty($_POST['pma_pw2'])) {
             $message = PMA_Message::error(__('The password is empty!'));
         }
     }
diff --git a/server_privileges.php b/server_privileges.php
index bfad2fcc29..644ab8ff5e 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -364,7 +364,7 @@ if (isset($_REQUEST['revokeall'])) {
  */
 if (isset($_REQUEST['change_pw'])) {
     $message = PMA_getMessageForUpdatePassword(
-        $pma_pw2, $err_url, $username, $hostname
+        $err_url, $username, $hostname
     );
 }