diff --git a/core/modules/user/user.module b/core/modules/user/user.module index f3d417f..b125f99 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1829,13 +1829,8 @@ function user_external_login_register($name, $module) { */ function user_pass_reset_url($account, $options = array()) { $timestamp = REQUEST_TIME; - $url_options = array('absolute' => TRUE); - if (isset($options['langcode'])) { - $url_options['language'] = language_load($options['langcode']); - } - else { - $url_options['language'] = user_preferred_langcode($account); - } + $langcode = isset($options['langcode']) ? $options['langcode'] : user_preferred_langcode($account); + $url_options = array('absolute' => TRUE, 'language' => language_load($langcode)); return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), $url_options); } @@ -1862,13 +1857,8 @@ function user_pass_reset_url($account, $options = array()) { */ function user_cancel_url($account, $options = array()) { $timestamp = REQUEST_TIME; - $url_options = array('absolute' => TRUE); - if (isset($options['langcode'])) { - $url_options['language'] = language_load($options['langcode']); - } - else { - $url_options['language'] = user_preferred_langcode($account); - } + $langcode = isset($options['langcode']) ? $options['langcode'] : user_preferred_langcode($account); + $url_options = array('absolute' => TRUE, 'language' => language_load($langcode)); return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), $url_options); }