Commit 72a19d00 authored by drumm's avatar drumm
Browse files

#81958 by edkwh. Fix multi-user deletion.

parent 04cbffcc
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment