summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-08-06 01:42:10 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2014-08-06 01:42:10 +0200
commita6cb5aa278082c88958cfac19fc39b1cfc3306b0 (patch)
tree8034dfd6ffea267ed64748f622bf4ef4e04cfdff
parent88db66c588e8c411daffb13b53e4a1f5f259dc48 (diff)
downloadbugzilla-a6cb5aa278082c88958cfac19fc39b1cfc3306b0.tar.gz
bugzilla-a6cb5aa278082c88958cfac19fc39b1cfc3306b0.tar.xz
Bug 1046145: It is no longer possible to cancel an email address change when this one has already been confirmed
r=dkl a=sgreen
-rwxr-xr-xtoken.cgi2
1 files changed, 1 insertions, 1 deletions
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";
}