summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-02-28 22:03:40 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-02-28 22:03:40 +0100
commitbd1e16f3436786875cb40074d27230a5428693e6 (patch)
tree6841eb0c37c9b0273d6db8f5cde34b15dcd0c0ad /program/steps/mail
parent4090870623b3634fc25457ff7bc58ecb00c1a318 (diff)
Don't skip message/* attachments when opening a draft. Restore check as it was before [fa57c988]
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index b082c2652..de75c88d5 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -982,7 +982,7 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
foreach ((array)$message->mime_parts as $pid => $part)
{
if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) {
- if ($part->ctype_primary == 'message' || $part->ctype_primary == 'multipart') {
+ if (($part->ctype_primary == 'message' && $bodyIsHtml) || $part->ctype_primary == 'multipart') {
continue;
}
if ($part->mimetype == 'application/ms-tnef') {