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 fc51f0d47b85c4c08f98b9cb0779fe3888941329..5ef7310635d1b76212dd4f529d36778705bfea9f 100644 (file)
--- 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');