summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-15 15:30:14 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-15 15:30:14 +0200
commit0f7d11e7984f9997fdf9b5b6a6d699030d62dfe4 (patch)
tree662d6a0e9fc37e809622afb3c31992323c44668d
parent9546d22c67fda4cbc4a9141dca11944e885ce8a7 (diff)
Better fix for headers decoding problem: fetch them as raw and let rcube_mime::decode_address_list() do the job right
-rw-r--r--program/steps/mail/compose.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index fd34ee098..691eca2db 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -412,19 +412,17 @@ foreach ($parts as $header) {
else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
// get drafted headers
if ($header=='to' && !empty($MESSAGE->headers->to))
- $fvalue = $MESSAGE->get_header('to');
+ $fvalue = $MESSAGE->get_header('to', true);
else if ($header=='cc' && !empty($MESSAGE->headers->cc))
- $fvalue = $MESSAGE->get_header('cc');
+ $fvalue = $MESSAGE->get_header('cc', true);
else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
- $fvalue = $MESSAGE->get_header('bcc');
+ $fvalue = $MESSAGE->get_header('bcc', true);
else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
$fvalue = $MESSAGE->get_header('mail-reply-to');
else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
$fvalue = $MESSAGE->get_header('reply-to');
else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
$fvalue = $MESSAGE->get_header('mail-followup-to');
-
- $decode_header = false; // $MESSAGE->get_header() returns already decoded header values
}
// split recipients and put them back together in a unique way