From 9f0310bf8c0821347699b434f659eb52decabf87 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Fri, 23 Nov 2007 12:58:33 +0000
Subject: Bug 363153: Turn on the utf8 bit on all strings in Bugzilla that
 contain non-ASCII data, if the utf8 parameter is on. This means that string
 functions like substr() work properly on multi-byte languages, now. Patch By
 Max Kanat-Alexander <mkanat@bugzilla.org> r=wurblzap, a=mkanat

---
 Bugzilla/Mailer.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Mailer.pm')

diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 03f370a4e..48f40d8b7 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -67,7 +67,9 @@ sub MessageToMTA {
     # Encode the headers correctly in quoted-printable
     foreach my $header qw(From To Cc Reply-To Sender Errors-To Subject) {
         if (my $value = $email->header($header)) {
-            $value = Encode::decode("UTF-8", $value) if Bugzilla->params->{'utf8'};
+            if (Bugzilla->params->{'utf8'} && !utf8::is_utf8($value)) {
+                $value = utf8::decode($value);
+            }
             my $encoded = encode('MIME-Q', $value);
             $email->header_set($header, $encoded);
         }
-- 
cgit v1.2.3-24-g4f1b