From b7aa9780e484262c044ac64927b5abf78d2d8259 Mon Sep 17 00:00:00 2001 From: Gregory Perry Date: Tue, 17 Apr 2012 00:22:48 +0000 Subject: [PATCH] Fix code style in user module --- core/modules/user/user.pages.inc | 5 +++-- core/modules/user/user.test | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc index f24849c..fa6c5b8 100644 --- a/core/modules/user/user.pages.inc +++ b/core/modules/user/user.pages.inc @@ -105,7 +105,8 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a if (!empty($reset_link_account)) { drupal_set_message(t('Another user (%other_user) is already logged into the site on this computer, but you tried to use a one-time link for user %resetting_user. Please logout and try using the link again.', array('%other_user' => $user->name, '%resetting_user' => $reset_link_account->name, '!logout' => url('user/logout')))); - } else { + } + else { // Invalid one-time link specifies an unknown user. drupal_set_message(t('The one-time login link you clicked is invalid.')); } @@ -281,7 +282,7 @@ function user_profile_form_submit($form, &$form_state) { if (!empty($edit['pass'])) { // Remove the password reset tag since a new password was saved. - unset($_SESSION['pass_reset_'. $account->uid]); + unset($_SESSION['pass_reset_' . $account->uid]); } // Clear the page cache because pages can contain usernames and/or profile information: cache_clear_all(); diff --git a/core/modules/user/user.test b/core/modules/user/user.test index 3a3a713..b7ca0a2 100644 --- a/core/modules/user/user.test +++ b/core/modules/user/user.test @@ -2046,7 +2046,7 @@ class UserRoleAdminTestCase extends DrupalWebTestCase { $old_weight = $role->weight; // Change the role weight and submit the form. - $edit = array('roles['. $rid .'][weight]' => $old_weight + 1); + $edit = array('roles[' . $rid . '][weight]' => $old_weight + 1); $this->drupalPost('admin/people/permissions/roles', $edit, t('Save order')); $this->assertText(t('The role settings have been updated.'), t('The role settings form submitted successfully.')); -- 1.7.5.4