From: Dave Miller <github@justdave.net>
Date: Thu, 16 Dec 2021 23:45:25 +0000 (-0500)
Subject: Bug 1657496: correctly handle MIME type on single-part email. r=eseyman, a=justdave
X-Git-Tag: bugzilla-5.0.4.1~20
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e36e9f902af57e26a3ae0e14ceb9dff78857989f;p=thirdparty%2Fbugzilla.git

Bug 1657496: correctly handle MIME type on single-part email. r=eseyman, a=justdave
---

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;