summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2013-01-07 11:11:52 +0000
committercatch2013-01-07 11:11:52 +0000
commitf5f88298a557080657866fe8bc0e9a32c69da421 (patch)
tree053f865fd72e093555f61f00abc00d066bb7bca7
parent57678447d4f1e4f5c00cee3e74843b3a9d509756 (diff)
Issue #200344 by Pancho, pillarsdotnet, pdrake, sun: Remove user_module_invoke() and rename user_login_block() to user_login_block_form().
-rw-r--r--core/modules/openid/openid.module2
-rw-r--r--core/modules/system/system.module2
-rw-r--r--core/modules/system/tests/modules/session_test/session_test.module8
-rw-r--r--core/modules/user/user.api.php4
-rw-r--r--core/modules/user/user.module4
5 files changed, 9 insertions, 11 deletions
diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module
index 092c3a4..426c8ae 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 6d16229..60cd4e0 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 3b378ad..d2c17ef 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 b5bbbf7..521efd8 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 5210583..4921c98 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');