diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module index 092c3a4b8de591d4a6644c235ac8bff13a0dbb6f..426c8ae11727c6c416bad81cacb18e4324b2b463 100644 --- a/core/modules/openid/openid.module +++ b/core/modules/openid/openid.module @@ -138,7 +138,7 @@ function openid_user_insert($account) { * * Save openid_identifier to visitor cookie. */ -function openid_user_login($edit, $account) { +function openid_user_login($account) { if (isset($_SESSION['openid'])) { // The user has logged in via OpenID. user_cookie_save(array_intersect_key($_SESSION['openid']['user_login_values'], array_flip(array('openid_identifier')))); diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 6d162296802e0d34ef05b29d9efff71e25e0cc1e..60cd4e0571ae4f874b77fd028e6efe2e24da1b7e 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2551,7 +2551,7 @@ function system_user_presave($account) { /** * Implements hook_user_login(). */ -function system_user_login($edit, $account) { +function system_user_login($account) { $config = config('system.timezone'); // If the user has a NULL time zone, notify them to set a time zone. if (!$account->timezone && $config->get('user.configurable') && $config->get('user.warn')) { diff --git a/core/modules/system/tests/modules/session_test/session_test.module b/core/modules/system/tests/modules/session_test/session_test.module index 3b378ad09ea63f0ab0c027d1f4c5f87b596f798a..d2c17ef3cb7133662a84d620ced0d10d317839ac 100644 --- a/core/modules/system/tests/modules/session_test/session_test.module +++ b/core/modules/system/tests/modules/session_test/session_test.module @@ -151,12 +151,12 @@ function _session_test_set_not_started() { } /** - * Implements hook_user(). + * Implements hook_user_login(). */ -function session_test_user_login($edit = array(), $user = NULL) { - if ($user->name == 'session_test_user') { +function session_test_user_login($account) { + if ($account->name == 'session_test_user') { // Exit so we can verify that the session was regenerated - // before hook_user() was called. + // before hook_user_login() was called. exit; } } diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index b5bbbf7cd1f9e73c6c9d1a72439fff33c8cf878c..521efd84c39cdd099289c2d1601ef7bbb37ab092 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -299,12 +299,10 @@ function hook_user_update($account) { /** * The user just logged in. * - * @param $edit - * The array of form values submitted by the user. * @param $account * The user object on which the operation was just performed. */ -function hook_user_login(&$edit, $account) { +function hook_user_login($account) { $config = config('system.timezone'); // If the user has a NULL time zone, notify them to set a time zone. if (!$account->timezone && $config->get('user.configurable') && $config->get('user.warn')) { diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 5210583f8a34905f381126e83735b0a7273b4ce0..4921c982804eea3b5b4348c6490f61ed531a042a 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1451,7 +1451,7 @@ function user_login_finalize(&$edit = array()) { // or incorrectly does a redirect which would leave the old session in place. drupal_session_regenerate(); - module_invoke_all('user_login', $edit, $user); + module_invoke_all('user_login', $user); } /** @@ -1470,7 +1470,7 @@ function user_login_form_submit($form, &$form_state) { /** * Implements hook_user_login(). */ -function user_user_login($edit, $account) { +function user_user_login($account) { // Reset static cache of default variables in template_preprocess() to reflect // the new user. drupal_static_reset('template_preprocess');