diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 740e14431..acd22b470 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1088,6 +1088,7 @@ function user_pass_reset($uid, $timestamp, $hashed_pass, $action = NULL) { // Now we can set the new user. $user = $account; // And proceed with normal login, going to user page. + $edit = array(); user_module_invoke('login', $edit, $user); 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'); @@ -1153,7 +1154,10 @@ function user_register() { // Redirect back to page which initiated the create request; usually admin/user/user/create $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']); } - $extra = _user_forms($null, $null, $null, 'register'); + + // Create a dummy variable for pass-by-reference parameters. + $null = NULL; + $extra = _user_forms($null, NULL, NULL, 'register'); // Remove form_group around default fields if there are no other groups. if (!$extra) { |