From 18767e67edcc30982d41298a12cd70f9048c0f81 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 28 May 2010 09:38:41 +0000 Subject: - Fix forwarding of messages with winmail attachments - Remove some redundant code for winmail handling in get.inc, move tnef_decode() to rcube_message - Fix handling of uuencoded attachments in message body (#1485839) - Extend rc_mime_content_type() to work with string buffer git-svn-id: https://svn.roundcube.net/trunk@3680 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/compose.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/steps/mail/compose.inc') diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index a6f1d9d11..b0da22711 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -725,8 +725,9 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) foreach ((array)$message->mime_parts as $pid => $part) { if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->ctype_primary != 'multipart' && - ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename)) - { + ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) + && $part->mimetype != 'application/ms-tnef' + ) { $skip = false; if ($part->mimetype == 'message/rfc822') { $messages[] = $part->mime_id; -- cgit v1.2.3