diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-09-07 07:32:12 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-09-07 07:32:12 +0000 |
| commit | 72a19d006391d9da5e0bb6aa3fab1c95b7c43e0c (patch) | |
| tree | f977d000d19c2543d76707fc85c97f544968305e /modules/user | |
| parent | 04cbffccc798fc2c0ff5b805d48ff57c6e6a5968 (diff) | |
| download | brdo-72a19d006391d9da5e0bb6aa3fab1c95b7c43e0c.tar.gz brdo-72a19d006391d9da5e0bb6aa3fab1c95b7c43e0c.tar.bz2 | |
#81958 by edkwh. Fix multi-user deletion.
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 05373d763..b61ddfd4a 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1918,10 +1918,6 @@ function theme_user_admin_new_role($form) { } function user_admin_account() { - if ($_POST['accounts'] && $_POST['operation'] == 'delete') { - return user_multiple_delete_confirm(); - } - $filter = user_build_filter_query(); $header = array( @@ -2226,8 +2222,13 @@ function user_admin($callback_arg = '') { $output = drupal_get_form('user_register'); break; default: - $output .= drupal_get_form('user_filter_form'); - $output .= drupal_get_form('user_admin_account'); + if ($_POST['accounts'] && $_POST['operation'] == 'delete') { + $output = drupal_get_form('user_multiple_delete_confirm'); + } + else { + $output .= drupal_get_form('user_filter_form'); + $output .= drupal_get_form('user_admin_account'); + } } return $output; } |