Bugzilla – Attachment 16985 Details for
Bug 6554
Resolve encoding problems with corrected UTF8 handling in templates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 6554 QA Followup
SIGNED-OFF-Bug-6554-QA-Followup.patch (text/plain), 1.90 KB, created by
Bernardo Gonzalez Kriegel
on 2013-03-28 16:07:05 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 6554 QA Followup
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2013-03-28 16:07:05 UTC
Size:
1.90 KB
patch
obsolete
>From 54fc2ef28e06f57a96fd1846c96fa1fb3fba4f97 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 27 Mar 2013 13:30:16 +0100 >Subject: [PATCH] [SIGNED-OFF] Bug 6554 QA Followup > >Removing binmode, now encoding data in output_with_http_headers. >Replaced output_string by output_as_chars in XSLTParse4Display. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >No errors. >--- > C4/Output.pm | 7 +------ > C4/XSLT.pm | 3 ++- > 2 files changed, 3 insertions(+), 7 deletions(-) > >diff --git a/C4/Output.pm b/C4/Output.pm >index 458b92f..63acf14 100644 >--- a/C4/Output.pm >+++ b/C4/Output.pm >@@ -298,17 +298,12 @@ sub output_with_http_headers { > $options->{'Content-Script-Type'} = 'text/javascript'; > } > >-# We can't encode here, that will double encode our templates, and xslt >-# We need to fix the encoding as it comes out of the database, or when we pass the variables to templates >- >-# utf8::encode($data) if utf8::is_utf8($data); >- > $data =~ s/\&\;amp\; /\&\; /g; >+ utf8::encode($data); > print $query->header($options), $data; > } > > sub output_html_with_http_headers { >- binmode( STDOUT, ":encoding(utf8)" ); > my ( $query, $cookie, $data, $status ) = @_; > output_with_http_headers( $query, $cookie, $data, 'html', $status ); > } >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index 139ddd2..e73a36a 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -221,7 +221,8 @@ sub XSLTParse4Display { > $stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc); > } > my $results = $stylesheet->{$xslfilename}->transform($source); >- my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results); >+ my $newxmlrecord = $stylesheet->{$xslfilename}->output_as_chars($results); >+ #no need to decode with UTF-8 in header of XSLT templates: BZ 6554 > return $newxmlrecord; > } > >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6554
:
4558
|
4560
|
4561
|
4562
|
4563
|
4564
|
5962
|
6041
|
6065
|
6070
|
6071
|
6072
|
6073
|
6076
|
6077
|
6078
|
6079
|
6080
|
6083
|
6084
|
6085
|
6108
|
10118
|
16780
|
16797
|
16857
|
16905
|
16929
|
16930
|
16931
|
16932
|
16960
|
16961
|
16962
|
16963
|
16964
|
16966
|
16968
|
16969
|
16984
|
16985
|
16986
|
16987
|
16988
|
16989
|
17179
|
17186
|
17187
|
17327
|
17328
|
18746
|
18747
|
18749
|
18750
|
21318
|
21399
|
21478
|
21488
|
21506
|
21509
|
21581
|
21629
|
21631
|
21632
|
21682
|
21937
|
21955
|
21978
|
21980
|
21981
|
23107
|
23140