diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-07-09 12:19:38 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-07-09 12:19:38 +0200 |
| commit | 3efc74654a30bd6d0141e1a15a123274408e9be8 (patch) | |
| tree | de51398064ee2c932f1568b3feb895549b65639a /program/steps | |
| parent | 98d096004d7222df2ec944d136ef6356df173f7b (diff) | |
- Don't add attachments content into reply/forward/draft message body (#1488557)
Diffstat (limited to 'program/steps')
| -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 70f657d8d..ccb72269a 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -629,7 +629,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; } |