From 7de276204b5859d9ce8a62dfaee8a5cbe30f069c Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 14 Nov 2008 15:11:04 -0700 Subject: [PATCH] Merge from HEAD (Request #4664). --- imp/docs/CHANGES | 2 ++ imp/lib/Message.php | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES index c0f16b70e..f5964a7e8 100644 --- a/imp/docs/CHANGES +++ b/imp/docs/CHANGES @@ -2,6 +2,7 @@ v5.0-cvs -------- +[mms] Allow all parts in a message to be displayed (Bug #1866). [mms] Only support FCKeditor as GUI HTML editor. [mms] Strip extra 'Fwd' and 'Re' cruft from subject line when replying to or forwarding a message. @@ -16,6 +17,7 @@ v5.0-cvs v4.3.1-cvs ---------- +[mms] Marked stripped parts as 'attachment', not 'inline' (Request #4664). [mms] Fix linking from addresses in mailbox to compose screen (Bug #7432). [jan] Use mailer configuration when sending iTip replies (Bug #7388). [jan] Always display multipart/appledouble attachments. diff --git a/imp/lib/Message.php b/imp/lib/Message.php index 439815d88..3bac335c9 100644 --- a/imp/lib/Message.php +++ b/imp/lib/Message.php @@ -476,11 +476,13 @@ class IMP_Message if (!is_a($oldPart, 'Horde_Mime_Part')) { continue; } - $newPart = new Horde_Mime_Part('text/plain'); + $newPart = new Horde_Mime_Part(); + $newPart->setType('text/plain'); + $newPart->setDisposition('attachment'); /* We need to make sure all text is in the correct charset. */ $newPart->setCharset(NLS::getCharset()); - $newPart->setContents(sprintf(_("[Attachment stripped: Original attachment type: %s, name: %s]"), $oldPart->getType(), $oldPart->getName(true, true)), '8bit'); + $newPart->setContents(sprintf(_("[Attachment stripped: Original attachment type: %s, name: %s]"), $oldPart->getType(), $oldPart->getName(true)), '8bit'); $message->alterPart($partid, $newPart); } -- 2.11.0