From 72a19d006391d9da5e0bb6aa3fab1c95b7c43e0c Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Thu, 7 Sep 2006 07:32:12 +0000
Subject: [PATCH] #81958 by edkwh. Fix multi-user deletion.
---
modules/user/user.module | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/user/user.module b/modules/user/user.module
index 05373d7633a3..b61ddfd4aabb 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;
}
--
GitLab