From b68e2355d7dcc40de404a93b9d39add2a6e45510 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 7 Jun 2013 13:39:26 +0200 Subject: Fix so non-inline images aren't skipped on forward (#1489150) --- program/steps/mail/compose.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program') 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; } -- cgit v1.2.3