Skip to content

Commit

Permalink
ZBUG-623 : Prevent attachment duplication while saving or sending email.
Browse files Browse the repository at this point in the history
Inline pdf attachments are being converted to actual attachment as we are
considering inline-pdf as non renderable with html editor mode as well.
Fixing this by considering inline-pdf as non-renderable in case of
Text editor only.
  • Loading branch information
BhavinBathani authored and silentsakky committed Dec 6, 2018
1 parent 4ad6465 commit 15489bb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion WebRoot/js/zimbraMail/mail/model/ZmMailMsg.js
Expand Up @@ -2151,7 +2151,7 @@ function(findHits, includeInlineImages, includeInlineAtts) {

if (!this.isRealAttachment(attach) ||
(attach.contentType.match(/^image/) && attach.contentId && attach.foundInMsgBody && !includeInlineImages) ||
(attach.contentDisposition == "inline" && attach.fileName && ZmMimeTable.isRenderable(attach.contentType, true) && !includeInlineAtts)) {
(attach.contentDisposition == "inline" && attach.fileName && ZmMimeTable.isRenderable(attach.contentType, !appCtxt.get(ZmSetting.VIEW_AS_HTML)) && !includeInlineAtts)) {
continue;
}

Expand Down

0 comments on commit 15489bb

Please sign in to comment.