Commit e4857747 authored by Dries's avatar Dries
Browse files

- Rollback of #497612: broke CVS HEAD.

parent 98e504e8
...@@ -101,9 +101,9 @@ function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action = ...@@ -101,9 +101,9 @@ function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action =
watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp)); watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp));
// Set the new user. // Set the new user.
$user = $account; $user = $account;
// user_login_finalize() also updates the login timestamp of the // user_authenticate_finalize() also updates the login timestamp of the
// user, which invalidates further use of the one-time login link. // user, which invalidates further use of the one-time login link.
user_login_finalize(); user_authenticate_finalize($form_state['values']);
drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.')); drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
drupal_goto('user/' . $user->uid . '/edit'); drupal_goto('user/' . $user->uid . '/edit');
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment