summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNate Mow2013-09-04 23:54:54 (GMT)
committer Nate Mow2013-09-04 23:57:19 (GMT)
commitd28c487aefbcac1f2220e04eb56ceb4dc239ac86 (patch)
treebf218bc5a79db17ecfaa618dfe9f47605986396c
parentc993a5f72ef6e59734770427043615102db294fc (diff)
Fixes per #2080767, #2080801 and #2080871.
-rw-r--r--forms/advuser_admin_account.inc22
1 files changed, 21 insertions, 1 deletions
diff --git a/forms/advuser_admin_account.inc b/forms/advuser_admin_account.inc
index 9884ae5..788f566 100644
--- a/forms/advuser_admin_account.inc
+++ b/forms/advuser_admin_account.inc
@@ -146,7 +146,7 @@ function advuser_admin_account($form, &$form_state) {
'delete' => array(
'#type' => 'link',
'#title' => t('delete'),
- '#href' => "user/$account->uid/delete",
+ '#href' => "user/$account->uid/cancel",
'#options' => array('query' => $destination),
),
),
@@ -238,11 +238,31 @@ function advuser_admin_account_submit($form, &$form_state) {
case 'email': {
// Menu callback is provided for mass emailing.
+ $completeForm =& $form_state['complete form']['accounts'];
+ foreach ($form_accounts as $form_user_id => $value) {
+ $selected = isset($completeForm[$form_user_id]['#value'])
+ ? $completeForm[$form_user_id]['#value']
+ : 0;
+ if ($selected) {
+ $accounts[$form_user_id] = $form_user_id;
+ }
+ }
+
drupal_goto('admin/people/advuser/confirm/email');
} break;
case 'delete': {
// Menu callback is provided for mass deleting.
+ $completeForm =& $form_state['complete form']['accounts'];
+ foreach ($form_accounts as $form_user_id => $value) {
+ $selected = isset($completeForm[$form_user_id]['#value'])
+ ? $completeForm[$form_user_id]['#value']
+ : 0;
+ if ($selected) {
+ $accounts[$form_user_id] = $form_user_id;
+ }
+ }
+
drupal_goto('admin/people/advuser/confirm/delete');
} break;
}