Commit f5f88298 authored by catch's avatar catch

Issue #200344 by Pancho, pillarsdotnet, pdrake, sun: Remove...

Issue #200344 by Pancho, pillarsdotnet, pdrake, sun: Remove user_module_invoke() and rename user_login_block() to user_login_block_form().
parent 57678447
......@@ -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'))));
......
......@@ -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')) {
......
......@@ -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;
}
}
......
......@@ -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')) {
......
......@@ -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');
......
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