summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2008-08-21 12:38:10 +0000
committersvncommit <devs@roundcube.net>2008-08-21 12:38:10 +0000
commitc1cd53fd80f2027efdbffa1b93750d4baabc2931 (patch)
treec6fae7abe588be71d50e8a19d430855c460bb9ef
parent687009eee08db6cd7ea1763a23708c1efa4038a7 (diff)
escape html entities in forward/reply headers #1484904
-rw-r--r--program/steps/mail/compose.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 228181624..8a9a383d5 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -496,7 +496,7 @@ function rcmail_create_reply_body($body, $bodyIsHtml)
{
$prefix = sprintf("<br /><br />On %s, %s wrote:<br />\n",
$MESSAGE->headers->date,
- Q($MESSAGE->get_header('from')));
+ Q($MESSAGE->get_header('from'), 'replace'));
$prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
$suffix = "</blockquote>";
}
@@ -513,7 +513,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
{
// soft-wrap message first
$body = wordwrap($body, 80);
-
+
$prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
$MESSAGE->subject,
$MESSAGE->headers->date,
@@ -532,8 +532,8 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
"</tbody></table><br>",
Q($MESSAGE->subject),
Q($MESSAGE->headers->date),
- Q($MESSAGE->get_header('from')),
- Q($MESSAGE->get_header('to')));
+ Q($MESSAGE->get_header('from'), 'replace'),
+ Q($MESSAGE->get_header('to'), 'replace'));
}
// add attachments