--- invite.module 2009-03-25 08:39:20.000000000 -0600 +++ invite_new.module 2009-03-25 08:42:34.000000000 -0600 @@ -1008,7 +1008,6 @@ function _invite_validate_emails($sql, & */ function invite_form_submit($form, &$form_state) { global $user, $language; - // Set this now, so other modules can change it later. $form_state['redirect'] = 'invite'; @@ -1044,11 +1043,10 @@ function invite_form_submit($form, &$for 'resent' => $form_state['values']['resent'], 'data' => array('subject' => $subject, 'message' => $message), )); - // Send e-mail. $params = array('invite' => $invite); - $message = drupal_mail('invite', 'invite', $email, $language, $params, $from, TRUE); - if (1 || $message['result']) { + $sent_message = drupal_mail('invite', 'invite', $email, $language, $params, $from, TRUE); + if (1 || $sent_message['result']) { // Save invite. invite_save($invite); @@ -1075,12 +1073,12 @@ function invite_form_submit($form, &$for // Update user property if user is limited. user_save($user, array('invites' => $form_state['values']['remaining_invites'] - $num_succeeded)); } - $message = format_plural($num_succeeded, 'Your invitation has been successfully sent. You will be notified when the invitee joins the site.', '@count invitations have been successfully sent. You will be notified when any invitee joins the site.'); - drupal_set_message($message); + $output_message = format_plural($num_succeeded, 'Your invitation has been successfully sent. You will be notified when the invitee joins the site.', '@count invitations have been successfully sent. You will be notified when any invitee joins the site.'); + drupal_set_message($output_message); } if ($num_failed) { - $message = format_plural($num_failed, 'The entered e-mail address is invalid. Please correct it.', '@count entered e-mail addresses are invalid. Please correct them.'); - drupal_set_message($message, 'error'); + $output_message = format_plural($num_failed, 'The entered e-mail address is invalid. Please correct it.', '@count entered e-mail addresses are invalid. Please correct them.'); + drupal_set_message($output_message, 'error'); } else if (user_access('track invitations') && $user->uid) { // Everything went well: redirect to pending invites page.