diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-07-09 12:19:38 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-07-09 13:36:32 +0200 |
| commit | 84dfbf541f66a552e9f2d21dbc717df493f0a3b2 (patch) | |
| tree | 0793cd6993a4671c1ef2d675665ced71a49948bf /program/steps/mail | |
| parent | af32a2f5ece250427aa753b236e48784ffa07aba (diff) | |
- Don't add attachments content into reply/forward/draft message body (#1488557)
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/compose.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 8152f5dca..8a4715715 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -632,7 +632,8 @@ function rcmail_prepare_message_body() if (!empty($MESSAGE->parts)) { foreach ($MESSAGE->parts as $part) { - if ($part->type != 'content' || !$part->size) { + // skip no-content and attachment parts (#1488557) + if ($part->type != 'content' || !$part->size || $MESSAGE->is_attachment($part)) { continue; } |