From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 5 Aug 2014 23:44:20 +0000 (+0200)
Subject: Bug 1046145: It is no longer possible to cancel an email address change when this... 
X-Git-Tag: bugzilla-4.4.6~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=324cc1eb7e962c1df735b1ab524e045518acda04;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 62f1f51210..44ca46bd64 100755
--- a/token.cgi
+++ b/token.cgi
@@ -254,7 +254,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";
         }