From: Dave Miller <justdave@mozilla.com>
Date: Thu, 16 Dec 2021 23:51:46 +0000 (-0500)
Subject: Bug 1657496: correctly handle MIME type on single-part email. r=cybershadow, a=justdave
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=db9cc834dd06cdba84a215b05a5e72a627c044e2;p=thirdparty%2Fbugzilla.git

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

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index b5ac2163c..81d0f28cf 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -538,10 +538,9 @@ sub _generate_bugmail {
   # For tracking/diagnostic purposes, add our hostname
   $email->header_set('X-Generated-By' => hostname());
 
-  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');
   }
   $email->parts_set(\@parts);