From d311d809d650e4cab6a5bf0aeb92b97631672c64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 28 May 2010 05:38:41 -0400
Subject: [PATCH] - 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
---
program/steps/mail/compose.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index a6f1d9d..b0da227 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -725,8 +725,9 @@
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;
--
Gitblit v1.9.1