From 2ccf81dec1fbe4e215ea47700a4e006420318621 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sun, 15 Mar 2015 13:50:28 +0100
Subject: Bug 902395: Enforce utf8 = true for all installations and remove the
 utf8 parameter r=dkl a=sgreen

---
 Bugzilla/Attachment/PatchReader.pm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'Bugzilla/Attachment')

diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index d0e221220..202f4b4fd 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -73,12 +73,10 @@ sub process_diff {
         $vars->{'other_patches'} = \@other_patches;
 
         setup_template_patch_reader($reader, $vars);
-        # The patch is going to be displayed in a HTML page and if the utf8
-        # param is enabled, we have to encode attachment data as utf8.
-        if (Bugzilla->params->{'utf8'}) {
-            $attachment->data; # Populate ->{data}
-            utf8::decode($attachment->{data});
-        }
+        # The patch is going to be displayed in a HTML page, so we have
+        # to encode attachment data as utf8.
+        $attachment->data; # Populate ->{data}
+        utf8::decode($attachment->{data});
         $reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
     }
 }
@@ -91,9 +89,8 @@ sub process_interdiff {
 
     require PatchReader::Raw;
 
-    # Encode attachment data as utf8 if it's going to be displayed in a HTML
-    # page using the UTF-8 encoding.
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
+    # Encode attachment data as utf8 if it's going to be displayed in a HTML page.
+    if ($format ne 'raw') {
         $old_attachment->data; # Populate ->{data}
         utf8::decode($old_attachment->{data});
         $new_attachment->data; # Populate ->{data}
@@ -130,7 +127,7 @@ sub process_interdiff {
         $use_select = 1;
     }
 
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
+    if ($format ne 'raw') {
         binmode $interdiff_stdout, ':utf8';
         binmode $interdiff_stderr, ':utf8';
     } else {
@@ -230,7 +227,7 @@ sub get_unified_diff {
 
     # Prints out to temporary file.
     my ($fh, $filename) = File::Temp::tempfile();
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
+    if ($format ne 'raw') {
         # The HTML page will be displayed with the UTF-8 encoding.
         binmode $fh, ':utf8';
     }
-- 
cgit v1.2.3-24-g4f1b