From a6cb5aa278082c88958cfac19fc39b1cfc3306b0 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 6 Aug 2014 01:42:10 +0200
Subject: Bug 1046145: It is no longer possible to cancel an email address
 change when this one has already been confirmed r=dkl a=sgreen

---
 token.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/token.cgi b/token.cgi
index 9f7dcbdcb..d52106fa7 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";
         } 
-- 
cgit v1.2.3-24-g4f1b