diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-07 13:39:26 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-07 13:39:26 +0200 |
| commit | b68e2355d7dcc40de404a93b9d39add2a6e45510 (patch) | |
| tree | 8e5cacce382d07be4fc8bb7019bbd092491c6d02 | |
| parent | 1cdcafc7fca95bf06d4c6512aa96ce5d26cfe424 (diff) | |
Fix so non-inline images aren't skipped on forward (#1489150)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix so non-inline images aren't skipped on forward (#1489150) - Add imap_cache_ttl option to configure TTL of imap_cache - Make LDAP cache engine configurable via ldap_cache and ldap_cache_ttl options - Fix legacy options handling diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index ebdd7a075..d3bc7fe72 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1033,8 +1033,8 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) { continue; } - // skip inline images when forwarding in plain text - if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) { + // skip inline images when forwarding + if ($part->content_id && $part->disposition == 'inline' && $compose_mode == RCUBE_COMPOSE_FORWARD) { continue; } |