summaryrefslogtreecommitdiff
path: root/program/steps
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:04:29 +0100
commit22819a30818e9968ae707bf7fbbe9e108c7880d4 (patch)
tree964bad690aebc744c29f39970e7c16874cb8327c /program/steps
parentccc2e358f2cb3ea831f68b7c8df9192b3b675c17 (diff)
Don't skip message/* attachments when opening a draft. Restore check as it was before [fa57c988]
Diffstat (limited to 'program/steps')
-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 74c6d5f29..c4178198d 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') {