From e36e9f902af57e26a3ae0e14ceb9dff78857989f Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 16 Dec 2021 18:45:25 -0500 Subject: [PATCH] Bug 1657496: correctly handle MIME type on single-part email. r=eseyman, a=justdave --- Bugzilla/BugMail.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 110a1ffaf9..fdcbc9d5a2 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -467,9 +467,10 @@ sub _generate_bugmail { } my $email = Bugzilla::MIME->new($msg_header); - if (scalar(@parts) == 1) { - $email->content_type_set($parts[0]->content_type); - } else { + + # If there's only one part, we don't need to set the overall content type + # because Email::MIME will automatically take it from that part (bug 1657496) + if (scalar(@parts) > 1) { $email->content_type_set('multipart/alternative'); # Some mail clients need same encoding for each part, even empty ones. $email->charset_set('UTF-8') if $use_utf8; -- 2.47.2