From a4cf4577b1992b30f5d58b2c9b14a0210c39fac0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 11 Mar 2010 14:05:13 +0000
Subject: - Fix forwarding message omits CC header (#1486305)

---
 program/steps/mail/compose.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'program')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 3a63cc8fc..36a352955 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -621,8 +621,12 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
     $prefix .= 'Date: ' . $MESSAGE->headers->date . "\n";
     $prefix .= 'From: ' . $MESSAGE->get_header('from') . "\n";
     $prefix .= 'To: ' . $MESSAGE->get_header('to') . "\n";
+
+    if ($MESSAGE->headers->cc)
+      $prefix .= 'Cc: ' . $MESSAGE->get_header('cc') . "\n";
     if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
       $prefix .= 'Reply-To: ' . $MESSAGE->get_header('replyto') . "\n";
+
     $prefix .= "\n";
   }
   else
@@ -644,6 +648,10 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
       htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()),
       htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
 
+    if ($MESSAGE->headers->cc)
+      $prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Cc: </th><td>%s</td></tr>",
+        htmlspecialchars(Q($MESSAGE->get_header('cc'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
+
     if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
       $prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Reply-To: </th><td>%s</td></tr>",
         htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
-- 
cgit v1.2.3