- Fix forwarding message omits CC header (#1486305)

release-0.6
alecpl 15 years ago
parent aaf8255d18
commit a4cf4577b1

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Fix forwarding message omits CC header (#1486305)
- Add 'default_charset' option to user preferences (#1485451)
- Add 'delete_always' option to user preferences
- Support/Require tls:// prefix in 'smtp_server' option for TLS connections

@ -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()));

Loading…
Cancel
Save