From bb417b256b319d8a99ea611b76bad80c4d47004c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 22 Oct 2015 09:06:55 +0100
Subject: [PATCH] Bug 13618: Fix last occurrences recently introduced to master

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 .../prog/en/modules/circ/circulation_batch_checkouts.tt       | 4 ++--
 .../intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index d73348c02d..c09f87f0e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -129,7 +129,7 @@ $(document).ready(function() {
             [% END %]
             <td>[% checkout_info.barcode %]</td>
             <td>
-              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&amp;type=intra"><strong>[% checkout_info.item.title |html %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&amp;itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a>
+              <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.item.biblionumber %]&amp;type=intra"><strong>[% checkout_info.item.title %][% FOREACH subtitl IN checkout_info.item.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF checkout_info.item.author %], by [% checkout_info.item.author %][% END %][% IF ( checkout_info.itme.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.item.biblionumber %]&amp;itemnumber=[% checkout_info.item.itemnumber %]#item[% checkout_info.item.itemnumber %]">[% checkout_info.item.barcode %]</a>
             </td>
             <td>
               [% IF checkout_info.NEEDSCONFIRMATION %]
@@ -255,7 +255,7 @@ $(document).ready(function() {
                     Too many checked out.
                   [% END %]
                   [% IF checkout_info.UNKNOWN_BARCODE %]
-                    <li>The barcode was not found [% checkout_info.barcode |html %]
+                    <li>The barcode was not found [% checkout_info.barcode %]
                   [% END %]
                   [% IF checkout_info.DEBT %]
                     The patron has a debt of [% checkout_info.DEBT %] <!-- Need debt_confirmed -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
index 8dda61e4e5..689c8f40de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt
@@ -392,11 +392,11 @@
                                 </li>
                                 <li>
                                     <label for="barcode_height_scale">Scale height (relative to card): </label>
-                                    <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale |html %]" />
+                                    <input type="text" name="barcode_height_scale" id="barcode_height_scale" size="2" value="[% barcode_height_scale %]" />
                                 </li>
                                 <li>
                                     <label for="barcode_width_scale">Scale width (relative to card): </label>
-                                    <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale |html %]" />
+                                    <input type="text" name="barcode_width_scale" id="barcode_width_scale" size="2" value="[% barcode_width_scale %]" />
                                 </li>
                                 <li>
                                     <label for="barcode_type">Barcode type: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
index a7f847bf6c..0f0a841a35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
@@ -126,7 +126,7 @@
         <ol>
           <li>
             <label for="name" class="required">Name: </label>
-            <input type="text" name="name" id="name" value="[% field.name | html %]" />
+            <input type="text" name="name" id="name" value="[% field.name %]" />
           </li>
           <li>
             <label for="av">Authorised value category: </label>
@@ -143,7 +143,7 @@
           </li>
           <li>
             <label for="marcfield">Marc field: </label>
-            <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield| html %]" />
+            <input type="text" name="marcfield" id="marcfield" value="[% field.marcfield %]" />
           </li>
           <li>
             <label for="searchable">Searchable: </label>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index d2bbb6012c..efd97c2007 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -751,7 +751,7 @@ $(document).ready(function(){
             [% SET number_of_private_shelves = 0 %]
             [% FOREACH s IN add_to_some_private_shelves %]
                 [% IF shelfnumber != s.shelfnumber %]
-                    param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>";
+                    param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>";
                     [% SET number_of_private_shelves = number_of_private_shelves + 1 %]
                     [% IF number_of_private_shelves == 10 %][% LAST %][% END %]
                 [% END %]
@@ -763,7 +763,7 @@ $(document).ready(function(){
             [% SET number_of_public_shelves = 0 %]
             [% FOREACH s IN add_to_some_public_shelves %]
                 [% IF shelfnumber != s.shelfnumber %]
-                    param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname |html %]<\/option>";
+                    param1 += "<option id=\"s[% s.shelfnumber %]\" value=\"addtolist\">[% s.shelfname %]<\/option>";
                     [% SET number_of_public_shelves = number_of_public_shelves + 1 %]
                     [% IF number_of_public_shelves == 10 %][% LAST %][% END %]
                 [% END %]
-- 
2.39.5