From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 5 Aug 2014 23:42:10 +0000 (+0200)
Subject: Bug 1046145: It is no longer possible to cancel an email address change when this... 
X-Git-Tag: bugzilla-4.5.6~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6cb5aa278082c88958cfac19fc39b1cfc3306b0;p=thirdparty%2Fbugzilla.git

Bug 1046145: It is no longer possible to cancel an email address change when this one has already been confirmed
r=dkl a=sgreen
---

diff --git a/token.cgi b/token.cgi
index 9f7dcbdcb8..d52106fa71 100755
--- a/token.cgi
+++ b/token.cgi
@@ -256,7 +256,7 @@ sub cancelChangeEmail {
         # check to see if it has been altered
         if ($user->login ne $old_email) {
             $user->set_login($old_email);
-            $user->update({ keep_session => 1 });
+            $user->update({ keep_tokens => 1 });
 
             $vars->{'message'} = "email_change_canceled_reinstated";
         }