From 1bc48e3ee8d7bc73ed384803309f04c0068eafcc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 16 Jun 2008 04:06:53 -0400
Subject: [PATCH] - Fixed forwarding messages with one HTML attachment (#1484442) - Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1484914)
---
CHANGELOG | 6 ++++++
program/steps/mail/compose.inc | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 66e0633..d0a7e75 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/06/16 (alec)
+----------
+- Fixed sending emoticons
+- Fixed forwarding messages with one HTML attachment (#1484442)
+- Fixed encoding of message/rfc822 attachments and image/pjpeg handling (#1484914)
+
2008/06/15 (alec)
----------
- Added option to select skin in user preferences
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 855066b..0bfcaf2 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -522,7 +522,7 @@
// add attachments
if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
- rcmail_write_compose_attachments($MESSAGE);
+ rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
return $prefix.$body;
}
@@ -539,13 +539,13 @@
if (!isset($_SESSION['compose']['forward_attachments'])
&& is_array($MESSAGE->mime_parts)
&& count($MESSAGE->mime_parts) > 0)
- rcmail_write_compose_attachments($MESSAGE);
+ rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
return $body;
}
-function rcmail_write_compose_attachments(&$message)
+function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
{
global $RCMAIL, $IMAP;
@@ -556,7 +556,7 @@
foreach ((array)$message->mime_parts as $pid => $part)
{
- if ($part->ctype_primary != 'message' &&
+ if (($part->ctype_primary != 'message' || !$bodyIsHtml) &&
($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
(empty($part->disposition) && $part->filename)))
{
--
Gitblit v1.9.1