summaryrefslogtreecommitdiff
path: root/program
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:39:26 +0200
commitb68e2355d7dcc40de404a93b9d39add2a6e45510 (patch)
tree8e5cacce382d07be4fc8bb7019bbd092491c6d02 /program
parent1cdcafc7fca95bf06d4c6512aa96ce5d26cfe424 (diff)
Fix so non-inline images aren't skipped on forward (#1489150)
Diffstat (limited to 'program')
-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 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;
}