diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-07-12 11:25:22 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-07-12 11:25:22 +0200 |
| commit | 3f9518f0a7e49ec259299093ae63f7de5b2f430e (patch) | |
| tree | bdba5453dc5276711edcccb94e4d9852c9e3f09e /program/steps/mail/compose.inc | |
| parent | 3a8633cdc3c2b07450f25a5f1d23c310d492a9dd (diff) | |
| parent | c4c9e8cdfce1c5734d9d75c79b9cec012bca57ad (diff) | |
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'program/steps/mail/compose.inc')
| -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; } |