diff --git a/core/modules/user/user.module b/core/modules/user/user.module index c7bf96a..b0bc699 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -617,7 +617,7 @@ function user_login_finalize(UserInterface $account) { /** * Implements hook_user_login(). */ -function user_user_login(AccountInterface $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'); @@ -626,7 +626,7 @@ function user_user_login(AccountInterface $account) { /** * Implements hook_user_logout(). */ -function user_user_logout(AccountInterface $account) { +function user_user_logout($account) { // Reset static cache of default variables in template_preprocess() to reflect // the new user. drupal_static_reset('template_preprocess'); @@ -649,7 +649,7 @@ function user_user_logout(AccountInterface $account) { * A unique URL that provides a one-time log in for the user, from which * they can change their password. */ -function user_pass_reset_url(UserInterface $account, $options = array()) { +function user_pass_reset_url($account, $options = array()) { $timestamp = REQUEST_TIME; $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode(); return \Drupal::url('user.reset', @@ -686,7 +686,7 @@ function user_pass_reset_url(UserInterface $account, $options = array()) { * @see user_mail_tokens() * @see \Drupal\user\Controller\UserController::confirmCancel() */ -function user_cancel_url(UserInterface $account, $options = array()) { +function user_cancel_url($account, $options = array()) { $timestamp = REQUEST_TIME; $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode(); $url_options = array('absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode)); @@ -953,7 +953,7 @@ function user_delete_multiple(array $uids) { * @return array * An array as expected by drupal_render(). */ -function user_view(UserInterface $account, $view_mode = 'full', $langcode = NULL) { +function user_view($account, $view_mode = 'full', $langcode = NULL) { return entity_view($account, $view_mode, $langcode); } @@ -971,7 +971,7 @@ function user_view(UserInterface $account, $view_mode = 'full', $langcode = NULL * @return array * An array in the format expected by drupal_render(). */ -function user_view_multiple(array $accounts, $view_mode = 'full', $langcode = NULL) { +function user_view_multiple($accounts, $view_mode = 'full', $langcode = NULL) { return entity_view_multiple($accounts, $view_mode, $langcode); } @@ -1019,7 +1019,7 @@ function user_mail($key, &$message, $params) { * A keyed array of settings and flags to control the token replacement * process. See \Drupal\Core\Utility\Token::replace(). */ -function user_mail_tokens(array &$replacements, array $data, array $options) { +function user_mail_tokens(&$replacements, $data, $options) { if (isset($data['user'])) { $replacements['[user:one-time-login-url]'] = user_pass_reset_url($data['user'], $options); $replacements['[user:cancel-url]'] = user_cancel_url($data['user'], $options); @@ -1279,7 +1279,7 @@ function user_role_revoke_permissions($rid, array $permissions = array()) { * * @see user_mail_tokens() */ -function _user_mail_notify($op, AccountInterface $account, $langcode = NULL) { +function _user_mail_notify($op, $account, $langcode = NULL) { // By default, we always notify except for canceled and blocked. $notify = \Drupal::config('user.settings')->get('notify.' . $op); if ($notify || ($op != 'status_canceled' && $op != 'status_blocked')) {