summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2012-05-14 03:22:49 (GMT)
committercatch2012-05-14 03:22:49 (GMT)
commitf54e6e3823ed97fd93c4b4c5355acc37ea5e0d89 (patch)
tree9d68b5bdb2d50d9cb38f512d9a9e5b6efaf8579f
parent439e27cc10680551e52e411c332c9860af919635 (diff)
Issue #1564996 by greggles: Added Make one-time login link watchdog more useful for auditing.
-rw-r--r--core/modules/user/user.pages.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index becb763..300bbc1 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -128,12 +128,12 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
// First stage is a confirmation form, then login
if ($action == 'login') {
- watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
// Set the new user.
$user = $account;
// user_login_finalize() also updates the login timestamp of the
// user, which invalidates further use of the one-time login link.
user_login_finalize();
+ watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
// Let the user's password be changed without the current password check.
$token = drupal_hash_base64(drupal_random_bytes(55));