From: lpsolit%gmail.com <>
Date: Thu, 10 May 2007 16:35:02 +0000 (+0000)
Subject: Bug 376911: Non-text content-types require setting the charset manually in the $cgi... 
X-Git-Tag: bugzilla-3.1.2~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61ec5e9081b152a7dea750f113aadf9c945ec2a8;p=thirdparty%2Fbugzilla.git

Bug 376911: Non-text content-types require setting the charset manually in the $cgi->header() call - Patch by guillomovitch@zarb.org r=gerv a=mkanat
---

diff --git a/duplicates.cgi b/duplicates.cgi
index 94b35df979..e393d7c257 100755
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -266,7 +266,13 @@ my $format = $template->get_format("reports/duplicates",
                                    scalar($cgi->param('format')),
                                    scalar($cgi->param('ctype')));
 
-print $cgi->header($format->{'ctype'});
+# We set the charset in Bugzilla::CGI, but CGI.pm ignores it unless the
+# Content-Type is a text type. In some cases, such as when we are
+# generating RDF, it isn't, so we specify the charset again here.
+print $cgi->header(
+    -type => $format->{'ctype'},
+    (Bugzilla->params->{'utf8'} ? ('charset', 'utf8') : () )
+);
 
 # Generate and return the UI (HTML page) from the appropriate template.
 $template->process($format->{'template'}, $vars)