summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-07 13:39:26 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-07 13:40:53 +0200
commitaafc0a3d24149da9f7350f760932898319041815 (patch)
treec6614e2d0bf7099c0611552f5f084409b3e18c38 /program/steps
parent55e60c6d85efa3e4b3679c8f9c0b97109ee31ca3 (diff)
Fix so non-inline images aren't skipped on forward (#1489150)
Conflicts: CHANGELOG
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 47dfa52ce..9e1b727ae 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1008,8 +1008,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;
}