diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-01 20:15:50 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-01 20:15:50 +0000 |
| commit | 8ab864973b328a3ebcae573f32e3b7f0bf2d669f (patch) | |
| tree | 296a086ca937245baa46dc3bc7095b1514e08381 | |
| parent | 9589a17af955ba1a7f11610fe0e6b0cb3bc97206 (diff) | |
Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table
git-svn-id: https://svn.roundcube.net/trunk@2106 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/rcube_message.php | 12 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 9aff68b52..75c47dfe0 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -373,14 +373,14 @@ class rcube_message // skip apple resource forks if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') continue; - - // part belongs to a related message - if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) { + + if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']); - $this->inline_parts[] = $mail_part; - } - else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) { + if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location']; + + // part belongs to a related message + if ($mail_part->content_id || $mail_part->content_location) { $this->inline_parts[] = $mail_part; } // is regular attachment diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 20c805a71..dc0a70834 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -649,7 +649,7 @@ function rcmail_print_body($part, $p = array()) // add head for malformed messages, washtml cannot work without that if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html)) $html = '<head></head>'. $html; - $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '</head>')), 0); + $html = substr_replace($html, '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0); } // clean HTML with washhtml by Frederic Motte |