From aafc0a3d24149da9f7350f760932898319041815 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 07 Jun 2013 07:40:53 -0400
Subject: [PATCH] Fix so non-inline images aren't skipped on forward (#1489150)
---
CHANGELOG | 1 +
program/steps/mail/compose.inc | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 92466b2..5c657a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
===========================
- Fix "null" instead of empty string on messages list in IE10 (#1489145)
+- Fix so non-inline images aren't skipped on forward (#1489150)
- Fix legacy options handling
- Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
- Fix bug where serialized strings were truncated in PDO::quote() (#1489142)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 47dfa52..9e1b727 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1008,8 +1008,8 @@
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;
}
--
Gitblit v1.9.1