From 6f4b50abea536bd13a3dc6dde04aaee825dc8c8e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 6 Apr 2013 19:28:47 +0200 Subject: Fix handling of invalid characters in message headers and output (#1489032) Conflicts: CHANGELOG --- program/steps/mail/compose.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/steps/mail/compose.inc') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index b75ac5280..a35dab27f 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -211,9 +211,9 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) } } else if ($compose_mode == RCUBE_COMPOSE_DRAFT) { - if ($MESSAGE->headers->others['x-draft-info']) { + if ($draft_info = $MESSAGE->headers->get('x-draft-info')) { // get reply_uid/forward_uid to flag the original message when sending - $info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']); + $info = rcmail_draftinfo_decode($draft_info); if ($info['type'] == 'reply') $COMPOSE['reply_uid'] = $info['uid']; @@ -230,8 +230,8 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) } } - if ($MESSAGE->headers->in_reply_to) - $COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>'; + if ($in_reply_to = $MESSAGE->headers->get('in-reply-to')) + $COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>'; $COMPOSE['references'] = $MESSAGE->headers->references; } -- cgit v1.2.3