Fix so non-inline images aren't skipped on forward (#1489150)
Conflicts:
CHANGELOG
| | |
| | | =========================== |
| | | |
| | | - 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) |
| | |
| | | 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; |
| | | } |
| | | |