Attachment 37037 Details for Bug 8007 – [PASSED QA] Bug 8007: Compatibility with bug 11944

[patch] [PASSED QA] Bug 8007: Compatibility with bug 11944

PASSED-QA-Bug-8007-Compatibility-with-bug-11944.patch (text/plain), 2.46 KB, created by Kyle M Hall (khall) on 2015-03-20 12:58:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-03-20 12:58:57 UTC

Size: 2.46 KB

patch

obsolete

>From 3bcb22dfd93133fd7cf60661124362efaf5d70ab Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 18 Dec 2014 15:39:46 +0100
>Subject: [PATCH] [PASSED QA] Bug 8007: Compatibility with bug 11944
>
>This patch should be applied to work with bug 11944.
>If you don't have 11944 yet, just don't apply this patch.
>
>Note that the line
>  binmode(STDOUT);
>in pl files is mandatory.
>
>It comes from bug 11944 that adds the line
>  binmode( STDOUT, ":utf8" );
>in C4::Templates::gettemplate.
>
>Signed-off-by: Lucie <lucie.rousseaux@dracenie.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> Koha/Borrower/Discharge.pm |    2 +-
> members/discharge.pl       |    3 ++-
> opac/opac-discharge.pl     |    3 ++-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Borrower/Discharge.pm b/Koha/Borrower/Discharge.pm
>index 1665bc7..ea84f78 100644
>--- a/Koha/Borrower/Discharge.pm
>+++ b/Koha/Borrower/Discharge.pm
>@@ -111,7 +111,7 @@ sub generate_as_pdf {
>     my $html_path = tmpnam() . '.html';
>     my $pdf_path = tmpnam() . '.pdf';
>     my $html_content = $tmpl->output;
>-    open my $html_fh, '>', $html_path;
>+    open my $html_fh, '>:encoding(utf8)', $html_path;
>     say $html_fh $html_content;
>     close $html_fh;
>     my $pdf = PDF::FromHTML->new( encoding => 'utf-8' );
>diff --git a/members/discharge.pl b/members/discharge.pl
>index 54a9f46..e2f703d 100755
>--- a/members/discharge.pl
>+++ b/members/discharge.pl
>@@ -29,7 +29,7 @@ Allows librarian to edit and/or manage borrowers' discharges
> 
> use Modern::Perl;
> 
>-use CGI;
>+use CGI qw( -utf8 );
> use C4::Auth;
> use C4::Output;
> use C4::Members;
>@@ -78,6 +78,7 @@ if ( $input->param('borrowernumber') ) {
>         my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf(
>             { borrowernumber => $borrowernumber, } );
> 
>+        binmode(STDOUT);
>         print $input->header(
>             -type       => 'application/pdf',
>             -charset    => 'utf-8',
>diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl
>index 8338d05..e6eca73 100755
>--- a/opac/opac-discharge.pl
>+++ b/opac/opac-discharge.pl
>@@ -20,7 +20,7 @@
> use Modern::Perl;
> 
> use C4::Auth qw(:DEFAULT get_session);
>-use CGI;
>+use CGI qw( -utf8 );
> use C4::Context;
> use C4::Output;
> use C4::Log;
>@@ -59,6 +59,7 @@ elsif ( $op eq 'get' ) {
>         borrowernumber => $loggedinuser
>     });
> 
>+    binmode(STDOUT);
>     print $input->header(
>         -type       => 'application/pdf',
>         -charset    => 'utf-8',
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 8007: 14490 | 16622 | 16935 | 17484 | 17485 | 21394 | 21395 | 21396 | 21660 | 21674 | 21675 | 21676 | 21677 | 21678 | 24023 | 24024 | 24025 | 24026 | 24027 | 30531 | 30532 | 30533 | 30534 | 30535 | 31007 | 34034 | 34035 | 34036 | 34037 | 34038 | 34039 | 34668 | 34669 | 34670 | 34671 | 34672 | 34673 | 34674 | 34675 | 36180 | 36181 | 36182 | 36183 | 36184 | 36185 | 36186 | 36187 | 36394 | 36395 | 36396 | 36397 | 36398 | 36399 | 36400 | 36401 | 37029 | 37030 | 37031 | 37032 | 37033 | 37034 | 37035 | 37036 | 37037 | 38596 | 38597