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

---
 email_in.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'email_in.pl')

diff --git a/email_in.pl b/email_in.pl
index 7b8232192..97fea4847 100644
--- a/email_in.pl
+++ b/email_in.pl
@@ -38,7 +38,7 @@ use Email::MIME;
 use Email::MIME::Attachment::Stripper;
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
-use Encode qw(encode decode);
+use Encode;
 
 use Bugzilla;
 use Bugzilla::Bug qw(ValidateBugID);
@@ -306,8 +306,8 @@ sub get_text_alternative {
         debug_print("Part Character Encoding: $charset", 2);
         if (!$ct || $ct =~ /^text\/plain/i) {
             $body = $part->body;
-            if (Bugzilla->params->{'utf8'}) {
-                $body = encode('UTF-8', decode($charset, $body));
+            if (Bugzilla->params->{'utf8'} && !utf8::is_utf8($body)) {
+                $body = Encode::decode($charset, $body);
             }
             last;
         }
-- 
cgit v1.2.3-24-g4f1b