summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module4
1 files changed, 2 insertions, 2 deletions
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',