From 7890bc409074b51b904f3059035ab8162314a69d Mon Sep 17 00:00:00 2001 From: Adam Bramley Date: Fri, 28 Oct 2011 11:21:32 +1300 Subject: [PATCH] Reroll fix for 488032 against latest dev --- reroute_email.module | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/reroute_email.module b/reroute_email.module index 6eb4319..4749818 100644 --- a/reroute_email.module +++ b/reroute_email.module @@ -122,15 +122,14 @@ function reroute_email_mail_alter(&$message) { if (variable_get(REROUTE_EMAIL_ENABLE_MESSAGE, 1)) { // Format a message to show at the top - $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[] = "-----------------------"; - - // Prepend to the body of the email - // -- I really think we should simply this a bit -- Khalid - $message['body'] = array_merge($msg, isset($message['body']) ? (is_array($message['body']) ? $message['body'] : array($message['body'])) : array()); + $msg = t("This email was rerouted.") . "\n"; + $msg .= t("Web site: @site", array('@site' => $base_url)) . "\n"; + $msg .= t("Mail key: @key", array('@key' => $mailkey)) . "\n"; + $msg .= t("Originally to: @to", array('@to' => $to)) . "\n"; + $msg .= "-----------------------" . "\n"; + + // Prepend to the body of the email + $message['body'] = $msg . (is_array($message['body']) ? implode("\n", $message['body']) : $message['body']); } } } -- 1.7.1