Attachment 16545 Details for Bug 8215 – Bug 8215 follow-up encoding for branches & itemtypes

[patch] Bug 8215 follow-up encoding for branches & itemtypes

Bug-8215-follow-up-encoding-for-branches--itemtype.patch (text/plain), 1.62 KB, created by Paul Poulain on 2013-03-20 16:18:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Poulain

Created: 2013-03-20 16:18:23 UTC

Size: 1.62 KB

patch

obsolete

>From 95af92dfbcc520880caacc2a53cf6da44fba62ea Mon Sep 17 00:00:00 2001
>From: Paul Poulain <paul.poulain@biblibre.com>
>Date: Fri, 28 Sep 2012 16:45:37 +0200
>Subject: [PATCH] Bug 8215 follow-up encoding for branches & itemtypes
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>
>---
> Koha/Template/Plugin/Branches.pm  |    3 ++-
> Koha/Template/Plugin/ItemTypes.pm |    3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm
>index ad768a5..e201ff7 100644
>--- a/Koha/Template/Plugin/Branches.pm
>+++ b/Koha/Template/Plugin/Branches.pm
>@@ -21,6 +21,7 @@ use Modern::Perl;
> 
> use Template::Plugin;
> use base qw( Template::Plugin );
>+use Encode qw{encode decode};
> 
> use C4::Koha;
> 
>@@ -31,7 +32,7 @@ sub GetName {
>     my $sth   = C4::Context->dbh->prepare($query);
>     $sth->execute($branchcode);
>     my $b = $sth->fetchrow_hashref();
>-    return $b->{'branchname'};
>+    return encode('UTF-8', $b->{'branchname'});
> }
> 
> 1;
>diff --git a/Koha/Template/Plugin/ItemTypes.pm b/Koha/Template/Plugin/ItemTypes.pm
>index 60ca979..abccbf4 100644
>--- a/Koha/Template/Plugin/ItemTypes.pm
>+++ b/Koha/Template/Plugin/ItemTypes.pm
>@@ -21,6 +21,7 @@ use Modern::Perl;
> 
> use Template::Plugin;
> use base qw( Template::Plugin );
>+use Encode qw{encode decode};
> 
> use C4::Koha;
> 
>@@ -31,7 +32,7 @@ sub GetDescription {
>     my $sth   = C4::Context->dbh->prepare($query);
>     $sth->execute($itemtype);
>     my $d = $sth->fetchrow_hashref();
>-    return $d->{'description'};
>+    return encode('UTF-8', $d->{'description'});
> 
> }
> 
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 8215: 9990 | 10181 | 10224 | 11131 | 11612 | 11657 | 11677 | 11678 | 11679 | 11680 | 11681 | 11682 | 11683 | 11860 | 11861 | 11862 | 11865 | 11875 | 11881 | 11882 | 11980 | 12039 | 12120 | 12128 | 12188 | 12189 | 12192 | 12246 | 12361 | 12400 | 12413 | 12414 | 12593 | 12627 | 13496 | 13497 | 13498 | 13499 | 15195 | 15196 | 15197 | 15198 | 15199 | 16228 | 16229 | 16251 | 16252 | 16532 | 16533 | 16534 | 16536 | 16537 | 16545 | 16567 | 16568 | 16587 | 16588 | 16599 | 16621 | 16623 | 16634 | 17333 | 17334 | 17335 | 17336 | 17337 | 17377 | 17378 | 17379 | 17894 | 17895 | 17896 | 17897 | 17898 | 17899 | 18274 | 18275 | 18276 | 18277 | 18278 | 18279 | 18282 | 18283 | 18284 | 18285 | 18286 | 18287 | 18288 | 18289 | 18290 | 18291 | 18292 | 18293 | 21885 | 23264