summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Auth/DB.pm2
-rw-r--r--Bugzilla/Token.pm2
-rw-r--r--Token.pm2
3 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Auth/DB.pm b/Bugzilla/Auth/DB.pm
index 55e4bc7c0..ffc49fbf7 100644
--- a/Bugzilla/Auth/DB.pm
+++ b/Bugzilla/Auth/DB.pm
@@ -71,7 +71,7 @@ sub authenticate {
# Now we know that the user has logged in successfully,
# so delete any password tokens for them
require Token;
- Token::DeletePasswordTokens("user logged in");
+ Token::DeletePasswordTokens($userid, "user_logged_in");
# The user may have had their account disabled
return (AUTH_DISABLED, $userid, $disabledtext)
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 97d2da41d..400d7d4fc 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -246,7 +246,7 @@ sub DeletePasswordTokens {
"WHERE userid=? AND tokentype='password'");
$sth->execute($userid);
while (my $token = $sth->fetchrow_array) {
- Token::Cancel($token, "user_logged_in");
+ Token::Cancel($token, $reason);
}
}
diff --git a/Token.pm b/Token.pm
index 97d2da41d..400d7d4fc 100644
--- a/Token.pm
+++ b/Token.pm
@@ -246,7 +246,7 @@ sub DeletePasswordTokens {
"WHERE userid=? AND tokentype='password'");
$sth->execute($userid);
while (my $token = $sth->fetchrow_array) {
- Token::Cancel($token, "user_logged_in");
+ Token::Cancel($token, $reason);
}
}