From d1f26518a39f1148f734bfc199702fbce58f6beb Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 7 Mar 2010 18:46:55 +0000 Subject: #677766 by matason and atheneus: Fixed Account gets blocked when user edits their profile. (with tests) --- modules/user/user.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/user/user.module') diff --git a/modules/user/user.module b/modules/user/user.module index 135ef3573..aaa9fd3b6 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -998,10 +998,10 @@ function user_account_form(&$form, &$form_state) { } if ($admin) { - $status = (isset($account->status) ? $account->status : 1); + $status = isset($account->status) ? $account->status : 1; } else { - $status = (variable_get('user_register', 1) == 1); + $status = $register ? variable_get('user_register', 1) == 1 : $account->status; } $form['account']['status'] = array( '#type' => 'radios', -- cgit v1.2.3