From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 16 Feb 2012 17:27:48 +0000 (+0100)
Subject: Bug 723944: Plain-text only emails are mangled when they contain non-ASCII characters
X-Git-Tag: bugzilla-4.3.1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95d52f72ef1b9c964c826d8a350a55697cb0d95;p=thirdparty%2Fbugzilla.git

Bug 723944: Plain-text only emails are mangled when they contain non-ASCII characters
r=glob a=LpSolit
---

diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index fc51f0d47b..5ef7310635 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -133,7 +133,11 @@ sub MessageToMTA {
         my ($part) = @_;
         return if $part->parts > 1; # Top-level
         my $content_type = $part->content_type || '';
-        if ($content_type !~ /;/) {
+        $content_type =~ /charset=['"](.+)['"]/;
+        # If no charset is defined or is the default us-ascii,
+        # then we encode the email to UTF-8 if Bugzilla has utf8 enabled.
+        # XXX - This is a hack to workaround bug 723944.
+        if (!$1 || $1 eq 'us-ascii') {
             my $body = $part->body;
             if (Bugzilla->params->{'utf8'}) {
                 $part->charset_set('UTF-8');