From e9d91b0a04c70b1e6c8dba025c5aaecc87ecea7d Mon Sep 17 00:00:00 2001
From: "justdave%syndicomm.com" <justdave%syndicomm.com>
Date: Tue, 19 Jun 2001 22:02:53 +0000
Subject: [PATCH] Fix for bug 45918: the old password field on the userprefs
 page is now used to log you back in if you try to change your password with
 cookies turned off, which avoids the confusing login screen after entering
 your new password in which you used to have to enter your old password one
 more time in order to let it set your new password (yes, it used to be as
 confusing as that just sounded :) r= tara@tequilarista.org

---
 webtools/bugzilla/userprefs.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/webtools/bugzilla/userprefs.cgi b/webtools/bugzilla/userprefs.cgi
index 5ad99cdbffa..f880cf8e228 100755
--- a/webtools/bugzilla/userprefs.cgi
+++ b/webtools/bugzilla/userprefs.cgi
@@ -130,9 +130,10 @@ sub ShowAccount {
     my ($realname) = (FetchSQLData());
 
     $realname = value_quote($realname);
-    
+        
     EmitEntry("Old password",
-              qq{<input type=password name="oldpwd">});
+              qq|<input type=hidden name="Bugzilla_login" value="$::COOKIE{Bugzilla_login}">| .
+              qq|<input type=password name="Bugzilla_password">|);
     EmitEntry("New password",
               qq{<input type=password name="pwd1">});
     EmitEntry("Re-enter new password", 
@@ -142,9 +143,9 @@ sub ShowAccount {
 }
 
 sub SaveAccount {
-    if ($::FORM{'oldpwd'} ne ""
+    if ($::FORM{'Bugzilla_password'} ne ""
         || $::FORM{'pwd1'} ne "" || $::FORM{'pwd2'} ne "") {
-        my $old = SqlQuote($::FORM{'oldpwd'});
+        my $old = SqlQuote($::FORM{'Bugzilla_password'});
         my $pwd1 = SqlQuote($::FORM{'pwd1'});
         my $pwd2 = SqlQuote($::FORM{'pwd2'});
         SendSQL("SELECT cryptpassword = ENCRYPT($old, LEFT(cryptpassword, 2)) " .