Révision bceb9b7a
Ajouté par Florent Torregrosa il y a environ 9 ans
| drupal7/modules/user/user.pages.inc | ||
|---|---|---|
| 126 | 126 |
drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
|
| 127 | 127 |
drupal_goto('user/password');
|
| 128 | 128 |
} |
| 129 |
elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
|
|
| 129 |
elseif ($account->uid && $timestamp >= $account->login && $timestamp <= $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)) {
|
|
| 130 | 130 |
// First stage is a confirmation form, then login |
| 131 | 131 |
if ($action == 'login') {
|
| 132 | 132 |
// Set the new user. |
| ... | ... | |
| 523 | 523 |
// Basic validation of arguments. |
| 524 | 524 |
if (isset($account->data['user_cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) {
|
| 525 | 525 |
// Validate expiration and hashed password/login. |
| 526 |
if ($timestamp <= $current && $current - $timestamp < $timeout && $account->uid && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
|
|
| 526 |
if ($timestamp <= $current && $current - $timestamp < $timeout && $account->uid && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid)) {
|
|
| 527 | 527 |
$edit = array( |
| 528 | 528 |
'user_cancel_notify' => isset($account->data['user_cancel_notify']) ? $account->data['user_cancel_notify'] : variable_get('user_mail_status_canceled_notify', FALSE),
|
| 529 | 529 |
); |
Formats disponibles : Unified diff
Update core to 7.35