aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2014-08-06 01:44:20 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2014-08-06 01:44:20 +0200
commit324cc1eb7e962c1df735b1ab524e045518acda04 (patch)
treeee86e37f45925d44c4c37cc7bb7c943ee098135f
parentBump version post-release (diff)
downloadbugzilla-324cc1eb7e962c1df735b1ab524e045518acda04.tar.gz
bugzilla-324cc1eb7e962c1df735b1ab524e045518acda04.tar.bz2
bugzilla-324cc1eb7e962c1df735b1ab524e045518acda04.zip
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 62f1f5121..44ca46bd6 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";
}