diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-12 04:30:09 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-10-12 04:30:09 +0000 |
| commit | f76acb2d9d421ff705be6fd2713b8cc2c007e1df (patch) | |
| tree | 9fe17e06724737f1a6579cf1a889a1222885412f /modules/user/user.pages.inc | |
| parent | a765e882ebf89969e81335a6df4fddb23d27095f (diff) | |
| download | brdo-f76acb2d9d421ff705be6fd2713b8cc2c007e1df.tar.gz brdo-f76acb2d9d421ff705be6fd2713b8cc2c007e1df.tar.bz2 | |
#282405 by Damien Tournoud, lilou, Dave Reid: Enforce coding standard on elseif.
Diffstat (limited to 'modules/user/user.pages.inc')
| -rw-r--r-- | modules/user/user.pages.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index 24eb3d6c5..ada98b6fb 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -92,7 +92,7 @@ function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action = 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.')); drupal_goto('user/password'); } - else if ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { + 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)); |