From: Dave Miller <github@justdave.net>
Date: Thu, 16 Dec 2021 23:44:27 +0000 (-0500)
Subject: Bug 1657496: correctly handle MIME type on single-part email. r=eseyman, a=justdave
X-Git-Tag: bugzilla-4.4.14~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a6c619b64ede17cac9578bb899988c850a9915;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 5a2c9b788e..644ed1f1cf 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -387,9 +387,10 @@ sub _generate_bugmail {
 
     # TT trims the trailing newline, and threadingmarker may be ignored.
     my $email = new Email::MIME("$msg_header\n");
-    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 Bugzilla->params->{'utf8'};