From 3eb070bb9ada260f180584cfa60677ccc64d54b1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 14 May 2014 11:29:50 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 11944: (follow-up) Remove all utf8 filter from templates This patch removes 2 new occurrences introduced by bug 11351 and bug 10493. Signed-off-by: Magnus Enger Removes a nasty "Template process failed: plugin error - EncodeUTF8: plugin not found at /home/magnus/scripts/kohaclone/C4/Templates.pm line 124" from /cgi-bin/koha/admin/itemtypes.pl --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 5 ++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 522420b..4132bdb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -1,4 +1,3 @@ -[% USE EncodeUTF8 %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Item types [% IF ( add_form ) %]› @@ -201,9 +200,9 @@ Item types administration <option value=""></option> [% FOREACH a IN AuthorisedValues.Get('SIP_MEDIA_TYPE', sip_media_type ) %] [% IF a.selected %] - <option value="[% a.authorised_value %]" selected="selected">[% a.lib | $EncodeUTF8 %]</option> + <option value="[% a.authorised_value %]" selected="selected">[% a.lib %]</option> [% ELSE %] - <option value="[% a.authorised_value %]">[% a.lib | $EncodeUTF8 %]</option> + <option value="[% a.authorised_value %]">[% a.lib %]</option> [% END %] [% END %] </select> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 1a9db9c..cb99b1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -55,7 +55,7 @@ [% ELSIF error == "too_soon" %] - <p>[% item.biblio.title | $EncodeUTF8 %] [% item.biblioitem.subtitle | $EncodeUTF8 %] ( [% item.barcode %] ) cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p> + <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) cannot be renewed before [% soonestrenewdate | $KohaDates %]. </p> [% IF Koha.Preference('AllowRenewalLimitOverride') %] <form method="post" action="/cgi-bin/koha/circ/renew.pl"> -- 1.9.1