diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 15:36:06 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-10-15 15:36:06 +0200 |
| commit | dec798e3aece05d7ffcd43e6a19a7678dea37e23 (patch) | |
| tree | b54ea858453eccb2bd28f4d44735b6ea359aa844 | |
| parent | 407ead5e75df42625ca9efff43843152880af399 (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.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index a4f5f346b..bd8b6c0d3 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -415,19 +415,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 |