Index: reroute_email.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reroute_email/reroute_email.module,v
retrieving revision 1.1.2.5
diff -r1.1.2.5 reroute_email.module
7c7,14
< function reroute_email_menu($may_cache) {
---
> /**
>  * Implementation of hook_perm().
>  */
> function reroute_email_perm() {
>   return array('administer reroute email');
> }
> 
> function reroute_email_menu() {
10,19c17,23
<   if ($may_cache) {
<     $items[] = array(
<       'path'               => 'admin/settings/reroute_email',
<       'title'              => t('Reroute Email'),
<       'description'        => t('Reroute emails to a test address.'),
<       'callback'           => 'drupal_get_form',
<       'callback arguments' => array('reroute_email_settings'),
<       'type'               => MENU_NORMAL_ITEM,
<     );
<   }
---
>   $items['admin/settings/reroute_email'] = array(
>     'title'              => t('Reroute Email'),
>     'description'        => t('Reroute emails to a test address.'),
>     'page callback'      => 'drupal_get_form',
>     'page arguments'     => array('reroute_email_settings'),
>     'access arguments'   => array('administer reroute email'),
>   );
37c41
< function reroute_email_mail_alter(&$mailkey, &$to, &$subject, &$body, &$from, &$headers) {
---
> function reroute_email_mail_alter(&$message) {
39a44,46
>   if (!empty($message) && is_array($message)) {
>     $mailkey = isset($message['id']) ? $message['id'] : t('<mail id> is missing');
>     $to = isset($message['to']) ? $message['to'] : t('<to> is missing');
41,43c48,57
<   unset($headers['Bcc']);
<   unset($headers['Cc']);
< 
---
>     if (isset($message['headers']) && is_array($message['headers'])) {
>       if (isset($message['headers']['Bcc'])) {
>         unset($message['headers']['Bcc']);
>       }
>       if (isset($message['headers']['Cc'])) {
>         unset($message['headers']['Cc']);
>       }
>     }
>   }
>   
45,49c59,63
<   $msg  = "This email was rerouted.\n";
<   $msg .= "Web site: @site\n";
<   $msg .= "Mail key: @key\n";
<   $msg .= "Originally to: <@to>\n";
<   $msg .= "-----------------------\n";
---
>   $msg[] = t("This email was rerouted.");
>   $msg[] = t("Web site: @site", array('@site' => $base_url));
>   $msg[] = t("Mail key: @key", array('@key' => $mailkey));
>   $msg[] = t("Originally to: <@to>", array('@to' => $to));
>   $msg[] = "-----------------------";
52c66
<   $body = t($msg, array('@site' => $base_url, '@to' => $to, '@key' => $mailkey)) . $body;
---
>   $message['body'] = array_merge($msg, isset($message['body']) ? (is_array($message['body']) ? $message['body'] : array($message['body'])) : array());
55c69
<   $to = variable_get(REROUTE_EMAIL_ADDRESS, ini_get('sendmail_from'));
---
>   $message['to'] = variable_get(REROUTE_EMAIL_ADDRESS, ini_get('sendmail_from'));
Index: reroute_email.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reroute_email/reroute_email.info,v
retrieving revision 1.1
diff -r1.1 reroute_email.info
4a5
> core = "6.x"