use $newpassword instead of $password consistently

darcs-hash:20080624224030-34904-a2a50cfcadba05799094574201223907e6e423a6.gz

diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 2d38f090830094825a50cd76fdb4bc0a6a6c104e..0357b9df6b417c9527ba5053b06cf6086e036714 100644 (file)
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -204,14 +204,14 @@ class RecoverpasswordAction extends Action {
                        return;
                }
 
-               $password = $this->trimmed('newpassword');
+               $newpassword = $this->trimmed('newpassword');
                $confirm = $this->trimmed('confirm');
 
-               if (!$password || strlen($password) < 6) {
+               if (!$newpassword || strlen($newpassword) < 6) {
                        $this->show_password_form(_t('Password must be 6 chars or more.'));
                        return;
                }
-               if ($password != $confirm) {
+               if ($newpassword != $confirm) {
                        $this->show_password_form(_t('Password and confirmation do not match.'));
                        return;
                }