Attachment 35231 Details for Bug 11944 – Bug 11944: TT Plugins should not encode strings

[patch] Bug 11944: TT Plugins should not encode strings

Bug-11944-TT-Plugins-should-not-encode-strings.patch (text/plain), 2.81 KB, created by Jonathan Druart on 2015-01-14 15:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-01-14 15:43:12 UTC

Size: 2.81 KB

patch

obsolete

>From eda6bf5f2caf5dc2971b110684b84354b270c0e6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Mon, 17 Mar 2014 13:33:43 +0100
>Subject: [PATCH] Bug 11944: TT Plugins should not encode strings
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> Koha/Template/Plugin/AuthorisedValues.pm | 7 ++-----
> Koha/Template/Plugin/Branches.pm         | 5 ++---
> Koha/Template/Plugin/ItemTypes.pm        | 1 -
> 3 files changed, 4 insertions(+), 9 deletions(-)
>
>diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm
>index 0198ab4..36ddce1 100644
>--- a/Koha/Template/Plugin/AuthorisedValues.pm
>+++ b/Koha/Template/Plugin/AuthorisedValues.pm
>@@ -21,13 +21,11 @@ use Modern::Perl;
> use Template::Plugin;
> use base qw( Template::Plugin );
> 
>-use Encode qw{encode is_utf8};
>-
> use C4::Koha;
> 
> sub GetByCode {
>     my ( $self, $category, $code, $opac ) = @_;
>-    return encode( 'UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) );
>+    return GetAuthorisedValueByCode( $category, $code, $opac );
> }
> 
> sub Get {
>@@ -65,8 +63,7 @@ The parameters are identical to those used by the subroutine C4::Koha::GetAuthor
> 
> sub GetByCode {
>     my ( $self, $category, $code, $opac ) = @_;
>-    my $av = GetAuthorisedValueByCode( $category, $code, $opac );
>-    return $av;
>+    return GetAuthorisedValueByCode( $category, $code, $opac );
> }
> 
> =head2 GetAuthValueDropbox
>diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm
>index 781cd21..92db535 100644
>--- a/Koha/Template/Plugin/Branches.pm
>+++ b/Koha/Template/Plugin/Branches.pm
>@@ -21,7 +21,6 @@ use Modern::Perl;
> 
> use Template::Plugin;
> use base qw( Template::Plugin );
>-use Encode qw{encode is_utf8};
> 
> use C4::Koha;
> use C4::Context;
>@@ -33,7 +32,7 @@ sub GetName {
>     my $sth   = C4::Context->dbh->prepare($query);
>     $sth->execute($branchcode);
>     my $b = $sth->fetchrow_hashref();
>-    return $b->{branchname};
>+    return $b ? $b->{'branchname'} : q{};
> }
> 
> sub GetLoggedInBranchcode {
>@@ -51,7 +50,7 @@ sub GetURL {
>     my $sth   = C4::Context->dbh->prepare($query);
>     $sth->execute($branchcode);
>     my $b = $sth->fetchrow_hashref();
>-    return encode( 'UTF-8', $b->{'branchurl'} );
>+    return $b->{branchurl};
> }
> 
> 1;
>diff --git a/Koha/Template/Plugin/ItemTypes.pm b/Koha/Template/Plugin/ItemTypes.pm
>index c913189..941ce03 100644
>--- a/Koha/Template/Plugin/ItemTypes.pm
>+++ b/Koha/Template/Plugin/ItemTypes.pm
>@@ -21,7 +21,6 @@ use Modern::Perl;
> 
> use Template::Plugin;
> use base qw( Template::Plugin );
>-use Encode qw{encode decode};
> 
> use C4::Koha;
> 
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253