From 1dad780cf11c78b23820642f5e09a653cb8fd386 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 25 Oct 2018 12:55:43 -0300
Subject: [PATCH] Bug 21669: Do not html filter TT assignement statements
Why? Because we must filter the variables when we display them.
If we escape them on assignement, they will be double escaped:
[% XXX = "<span>pouet</span>" | html %]
[% XXX | html %]
=> <span>pouet</span>
Also it will bring trouble if we are assigning a structure (see bug
21663 for instance).
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
.../prog/en/includes/branch-selector.inc | 4 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++--
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 16 ++++++++--------
.../prog/en/modules/acqui/booksellers.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 8 ++++----
.../prog/en/modules/acqui/neworderempty.tt | 6 +++---
.../prog/en/modules/admin/authorised_values.tt | 4 ++--
.../prog/en/modules/admin/categories.tt | 4 ++--
.../prog/en/modules/admin/matching-rules.tt | 2 +-
.../prog/en/modules/admin/patron-attr-types.tt | 4 ++--
.../prog/en/modules/catalogue/detail.tt | 4 ++--
.../prog/en/modules/catalogue/itemsearch.tt | 4 ++--
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/cataloguing/merge.tt | 10 +++++-----
.../prog/en/modules/circ/circulation.tt | 4 ++--
.../en/modules/circ/circulation_batch_checkouts.tt | 4 ++--
.../prog/en/modules/ill/ill-requests.tt | 2 +-
.../prog/en/modules/members/discharge.tt | 4 ++--
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/members-update.tt | 2 +-
.../prog/en/modules/reports/cash_register_stats.tt | 4 ++--
.../prog/en/modules/reports/guided_reports_start.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +-
.../prog/en/modules/tools/modborrowers.tt | 2 +-
.../opac-tmpl/bootstrap/en/includes/item-status.inc | 6 +++---
.../bootstrap/en/includes/opac-topissues.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 20 ++++++++++----------
.../bootstrap/en/modules/opac-illrequests.tt | 4 ++--
.../bootstrap/en/modules/opac-opensearch.tt | 2 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 10 +++++-----
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++---
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 ++--
.../bootstrap/en/modules/opac-showreviews-rss.tt | 2 +-
.../bootstrap/en/modules/opac-showreviews.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 8 ++++----
35 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
index 6aea85b..f05fa91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc
@@ -1,8 +1,8 @@
[%# First check to see if we have anything selected, otherwise we select all %]
-[% selectall = 1 | html %]
+[% selectall = 1 %]
[% FOREACH branch IN branches %]
[% IF branch.selected %]
- [% selectall = 0 | html %]
+ [% selectall = 0 %]
[% END %]
[% END %]
<div class="branchselector">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 51a648d..9b80e3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -117,8 +117,8 @@
<td>[% current_date_and_time | $KohaDates with_hours => 1 | html %]</td>
</tr>
<tr>
- [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' | html %]
- [% timezone_env_class = (time_zone.env_invalid) ? 'status_warn' : '' | html %]
+ [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' %]
+ [% timezone_env_class = (time_zone.env_invalid) ? 'status_warn' : '' %]
<th scope="row">Time zone: </th>
<td>Used: <span>[% time_zone.actual | html %]</span>
[% IF time_zone.actual_bad_tz_fallback %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index ab91cb2..9be0d3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -464,13 +464,13 @@
<a class="edit_note" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"><i class="fa fa-plus"></i> Add vendor note</a>
[% END %]
[% IF (books_loo.transferred_from) %]
- [% basket = books_loo.transferred_from.basket | html %]
- [% bookseller = books_loo.transferred_from.bookseller | html %]
- [% timestamp = books_loo.transferred_from.timestamp | html %]
+ [% basket = books_loo.transferred_from.basket %]
+ [% bookseller = books_loo.transferred_from.bookseller %]
+ [% timestamp = books_loo.transferred_from.timestamp %]
<p>Transferred from basket:
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a>
(<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>)
- on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
+ on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
[% timestamp | $KohaDates %]
</span>
</p>
@@ -582,13 +582,13 @@
[% END %]
</p>
[% IF order.transferred_to %]
- [% basket = order.transferred_to.basket | html %]
- [% bookseller = order.transferred_to.bookseller | html %]
- [% timestamp = order.transferred_to.timestamp | html %]
+ [% basket = order.transferred_to.basket %]
+ [% bookseller = order.transferred_to.bookseller %]
+ [% timestamp = order.transferred_to.timestamp %]
<p>Transferred to basket:
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a>
(<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>)
- on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]">
+ on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
[% timestamp | $KohaDates %]
</span>
</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index f8d5d8b..c5da9f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -128,7 +128,7 @@
<td><span title="[% basket.creationdate | html %]">[% basket.creationdate | $KohaDates %]</span></td>
<td>
[% IF basket.basketgroup %]
- [% basketgroup = basket.basketgroup | html %]
+ [% basketgroup = basket.basketgroup %]
[% IF basketgroup.closed %]
[% basketgroup.name | html %] (closed)
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index c66c94b..281df73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -104,14 +104,14 @@
<th>Encumber while invoice open</th>
<th> </th>
</tr>
- [% total_adj = 0 | html %]
+ [% total_adj = 0 %]
[% FOREACH adjustment IN adjustments %]
- [% total_adj = total_adj + adjustment.adjustment | html %]
+ [% total_adj = total_adj + adjustment.adjustment %]
<tr>
<td><input type="hidden" name="adjustment_id" value="[% adjustment.adjustment_id | html %]" />[% adjustment.adjustment_id | html %]</td>
<td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price %]" /></td>
<td>
- [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %]
+ [% reasons = AuthorisedValues.Get("ADJ_REASON") %]
[% IF reasons.0 %]
<select id="reason_[% adjustment.adjustment_id | html %]" name="reason">
<option value="">No reason</option>
@@ -174,7 +174,7 @@
<label for="adjustment_new">Amount: </label>
<input type="text" name="adjustment" id="adjustment_new" />
</li>
- [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %]
+ [% reasons = AuthorisedValues.Get("ADJ_REASON") %]
[% IF reasons.0 %]
<li>
<label for="reason_[% adjustment.adjustment_id | html %]">Reason: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index ee4b764..a9f0c63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -327,17 +327,17 @@
<input type="hidden" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
[% ELSE %]
<label class="required" for="budget_id">Fund: </label>
- [% active_count = 0 | html %]
+ [% active_count = 0 %]
[% IF !ordernumber %]
[% FOREACH budget_loo IN budget_loop %]
- [% active_count= active_count + budget_loo.b_active | html %]
+ [% active_count= active_count + budget_loo.b_active %]
[% END %]
[% END %]
<select id="budget_id" size="1" name="budget_id">
<option value="">Select a fund</option>
[% FOREACH budget_loo IN budget_loop %]
[% IF ( budget_loo.b_sel ) %]
- [% active_count = 0 #select no other fund | html %]
+ [% active_count = 0 #select no other fund %]
<option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]"
style="padding-left:[% budget_loo.b_level | html %]em;"
>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
index 3ae74d2..154eb08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
@@ -244,9 +244,9 @@
<td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl | html %]" alt=""/>[% ELSE %] [% END %]</td>
<td>
[% IF loo.branches.size > 0 %]
- [% branches_str = "" | html %]
+ [% branches_str = "" %]
[% FOREACH branch IN loo.branches %]
- [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" | html %]
+ [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %]
[% END %]
<span href="#" title="[% branches_str | html %]">
[% IF loo.branches.size > 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index 602fe11..c5f0e89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -435,9 +435,9 @@
<td>
[% SET branch_limitations = category.branch_limitations %]
[% IF branch_limitations.size > 0 %]
- [% branches_str = "" | html %]
+ [% branches_str = "" %]
[% FOREACH branch IN branch_limitations %]
- [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" | html %]
+ [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %]
[% END %]
<span title="[% branches_str | html %]">
[% IF branch_limitations.size > 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index 5e49968..d6faee9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -42,7 +42,7 @@
[%# PARAMS: selected_norm, id, name %]
[% UNLESS valid_norms.grep(selected_norm).size %]
[%# Fallback to 'none' %]
-[% selected_norm = 'none' | html %]
+[% selected_norm = 'none' %]
[% END %]
<select id="[% id | html %]" name="[% name | html %]">
[% PROCESS norms_options selected_norm=selected_norm %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index 76c038f..0ad7467 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -260,9 +260,9 @@
<td>[% item.description | html %]</td>
<td>
[% IF ( item.branches && item.branches.size > 0 ) %]
- [% branches_str = "" | html %]
+ [% branches_str = "" %]
[% FOREACH branch IN item.branches %]
- [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" | html %]
+ [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %]
[% END %]
<span title="[% branches_str | html %]">
[% IF item.branches.size > 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 451c105..06f1df0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -8,9 +8,9 @@
[% USE ColumnsSettings %]
[% IF Koha.Preference('AmazonAssocTag') %]
- [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %]
+ [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
[% ELSE %]
- [% AmazonAssocTag = '' | html %]
+ [% AmazonAssocTag = '' %]
[% END %]
[% ShowCourseReserves = 0 | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 05afac4..a7abe0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -72,9 +72,9 @@
[% IF items_search_fields.size %]
<optgroup label="Custom search fields">
[% FOREACH field IN items_search_fields %]
- [% marcfield = field.tagfield | html %]
+ [% marcfield = field.tagfield %]
[% IF field.tagsubfield %]
- [% marcfield = marcfield _ '$' _ field.tagsubfield | html %]
+ [% marcfield = marcfield _ '$' _ field.tagsubfield %]
[% END %]
<option value="marc:[% marcfield | html %]" data-authorised-values-category="[% field.authorised_values_category | html %]">[% field.label | html %] ([% marcfield | html %])</option>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index ce5179f..c49d8b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -399,7 +399,7 @@
[% SEARCH_RESULT.XSLTResultsRecord | $raw %]
[% ELSE %]
<p>[% SEARCH_RESULT.result_number | html %].
- [% biblionumber = SEARCH_RESULT.biblionumber | html %]
+ [% biblionumber = SEARCH_RESULT.biblionumber %]
[% INCLUDE 'biblio-default-view.inc' %]
<b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title | html %][% ELSE %]No title[% END %]</b>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
index d7d378a..80c8cc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
@@ -46,12 +46,12 @@ div#result { margin-top: 1em; }
<tr>
<th>Biblionumber</th>
[% FOREACH key IN report_header.keys.sort %]
- [% tag = key.substr(0, 3) | html %]
- [% code = key.substr(3, 1) | html %]
+ [% tag = key.substr(0, 3) %]
+ [% code = key.substr(3, 1) %]
[% IF code == '@' %]
- [% header = tag | html %]
+ [% header = tag %]
[% ELSE %]
- [% header = tag _ '$' _ code | html %]
+ [% header = tag _ '$' _ code %]
[% END %]
<th>[% header | html %]</th>
[% END %]
@@ -68,7 +68,7 @@ div#result { margin-top: 1em; }
</td>
[% FOREACH key IN report_header.keys.sort %]
<td>
- [% values = record.fields.$key | html %]
+ [% values = record.fields.$key %]
[% IF values %]
[% FOREACH value IN record.fields.$key %]
[% value | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 2b273e0..ee23e4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -155,7 +155,7 @@
[% IF ( itemtype_notforloan ) %]
Item type is normally not for loan.
[% ELSIF ( item_notforloan ) %]
- [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) | html %]
+ [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %]
Item is normally not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib | html %])[% END %].
[% END %]
[% IF CAN_user_circulate_force_checkout %]
@@ -341,7 +341,7 @@
[% IF ( itemtype_notforloan ) %]
Item type not for loan.
[% ELSIF ( item_notforloan ) %]
- [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) | html %]
+ [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %]
Item not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib | html %])[% END %].
[% END %]
</li>
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 eada733..566dfdf 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
@@ -152,7 +152,7 @@
[% IF checkout_info.itemtype_notforloan %]
<li><i class="fa fa-li fa-warning"></i>Item type is normally not for loan.</li>
[% ELSIF checkout_info.item_notforloan %]
- [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, checkout_info.item_notforloan, 0 ) | html %]
+ [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, checkout_info.item_notforloan, 0 ) %]
<li><i class="fa fa-li fa-warning"></i>Item is normally not for loan [% IF item_notforloan_lib %]([% item_notforloan_lib | html %])[% END %].</li>
[% END %]
[% END %]
@@ -208,7 +208,7 @@
[% IF checkout_info.itemtype_notforloan %]
<li><i class="fa fa-li fa-exclamation"></i>Item type not for loan.</li>
[% ELSIF checkout_info.item_notforloan %]
- [% item_notforloan_lib = AuthorisedValues.GetByCode( checkout_info.authvalcode_notforloan, checkout_info.item_notforloan, 0 ) | html %]
+ [% item_notforloan_lib = AuthorisedValues.GetByCode( checkout_info.authvalcode_notforloan, checkout_info.item_notforloan, 0 ) %]
<li><i class="fa fa-li fa-exclamation"></i>Item not for loan [% IF checkout_info.item_notforloan_lib %]([% checkout_info.item_notforloan_lib | html %])[% END %].</li>
[% END %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 5846162..7250f5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -427,7 +427,7 @@
</li>
<li class="status">
<label class="status">Status:</label>
- [% stat = request.status | html %]
+ [% stat = request.status %]
[% request.capabilities.$stat.name | html %]
</li>
<li class="updated">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
index 694f494..d3d636d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
@@ -56,8 +56,8 @@
<tbody>
[% FOR d IN validated_discharges %]
<tr>
- <td>[% d.needed | $KohaDates with_hours = 1 | html %]</td>
- <td>[% d.validated | $KohaDates with_hours = 1 | html %]</td>
+ <td>[% d.needed | $KohaDates with_hours = 1 %]</td>
+ <td>[% d.validated | $KohaDates with_hours = 1 %]</td>
</tr>
[% END %]
</tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index e454295..49ddce8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1304,7 +1304,7 @@
$(document).ready(function () {
$("#entryform,#saverecord").hide();
- [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') | html %]
+ [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %]
var qaddfields = [[% FOREACH field IN q_add_f.unique %]"[% field | html %]",[% END %]];
var skipped_fields = ["contactname","contactfirstname","relationship"]; //Guarantor form is pulled as a whole, ignore individual fields
$("#entryform label").each(function () {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index 687afde..32677d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -99,7 +99,7 @@
<div id="pending_updates">
[% FOREACH pm IN PendingModifications %]
[% SET borrowernumber = pm.borrowernumber %]
- <h3><a href="#panel_modify_[% pm.borrowernumber | html %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 | html %]</a></h3>
+ <h3><a href="#panel_modify_[% pm.borrowernumber | html %]">[% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 %]</a></h3>
<div id="panel_modify_[% pm.borrowernumber | html %]">
<div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;">
<input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index 018cdee..f0439bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -122,7 +122,7 @@
[% END %]
[% FOREACH manualinv IN manualinv_types %]
- [% value_manualinv = manualinv.authorised_value|truncate(5, '') | html %]
+ [% value_manualinv = manualinv.authorised_value|truncate(5, '') %]
[% IF transaction_type == value_manualinv %]
<option value="[% value_manualinv | html %]" selected="selected">[% manualinv.authorised_value | html %]</option>
[% ELSE %]
@@ -218,7 +218,7 @@
<span>New card</span>
[% ELSE %]
[% FOREACH manualinv IN manualinv_types %]
- [% value_manualinv = manualinv.authorised_value|truncate(5, '') | html %]
+ [% value_manualinv = manualinv.authorised_value|truncate(5, '') %]
[% IF loopresul.accounttype == value_manualinv %]
<span>[% manualinv.authorised_value | html %]</span>
[% LAST %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index f432cf0..4aaa49e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -743,7 +743,7 @@ canned reports and writing custom SQL reports.</p>
[% FOREACH result IN results %]
<tr>
[% FOREACH cells IN result.cells %]
- [% place = loop.index | html %]
+ [% place = loop.index %]
[% IF header_row.$place.cell == 'itemnumber' %]
<input type="hidden" name="[% header_row.$place.cell | html %]" value="[% cells.cell | html %]" />
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 56cca28..149385e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -91,7 +91,7 @@
</thead>
<tbody>
[% FOREACH lette IN letter %]
- [% can_edit = lette.branchcode || !independant_branch | html %]
+ [% can_edit = lette.branchcode || !independant_branch %]
<tr>
<td>[% IF lette.branchname %][% lette.branchname | html %][% ELSE %](All libraries)[% END %]</td>
<td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 94e8050..a79974a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -69,7 +69,7 @@
[% END %]
[% IF ( op == 'show') && (!borrowers) && (!notfoundcardnumbers) # Alert if no patrons given%]
- [% op = 'noshow' # Change op to prevent display in code below | html %]
+ [% op = 'noshow' # Change op to prevent display in code below %]
<h1>Batch patrons modification</h1>
<div class="dialog alert">
<p>No patron card numbers given.</p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
index 55474da..99bdeed 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
@@ -8,7 +8,7 @@
[% IF ( item.itemlost ) %]
[% SET itemavailable = 0 %]
- [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) | html %]
+ [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %]
[% IF ( av_lib_include ) %]
<span class="item-status lost">[% av_lib_include | html %]</span>
[% ELSE %]
@@ -53,7 +53,7 @@
[% IF ( item.withdrawn ) %]
[% SET itemavailable = 0 %]
- [% av_lib_include = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn, 1 ) | html %]
+ [% av_lib_include = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn, 1 ) %]
[% IF av_lib_include %]
<span class="item-status withdrawn">[% av_lib_include | html %]</span>
[% ELSE %]
@@ -76,7 +76,7 @@
[% IF ( item.damaged ) %]
[% SET itemavailable = 0 %]
- [% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) | html %]
+ [% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) %]
[% IF av_lib_include %]
<span class="item-status damaged">[% av_lib_include | html %]</span>
[% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
index 5bf505b..6f08f1c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
@@ -25,7 +25,7 @@
</select></li>
[% END %]
- [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') | html %]
+ [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') %]
[% IF AdvancedSearchTypes.grep('^itemtypes$').size %]
<li>
<label for="itemtype">Limit to: </label>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index c451d8d..f9a680d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -9,18 +9,18 @@
[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %]
[% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %]
[% IF Koha.Preference('AmazonAssocTag') %]
- [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %]
+ [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
[% ELSE %]
- [% AmazonAssocTag = '' | html %]
+ [% AmazonAssocTag = '' %]
[% END %]
-[% ShowCourseReservesHeader = 0 | html %]
+[% ShowCourseReservesHeader = 0 %]
[% IF Koha.Preference( 'UseCourseReserves' ) == 1 %]
[% FOREACH ITEM_RESULT IN itemloop %]
[% IF ITEM_RESULT.course_reserves %]
[% FOREACH r IN ITEM_RESULT.course_reserves %]
[% IF r.course.enabled == 'yes' %]
- [% ShowCourseReservesHeader = 1 | html %]
+ [% ShowCourseReservesHeader = 1 %]
[% END %]
[% END %]
[% END %]
@@ -78,13 +78,13 @@
<div title="[% biblio.biblionumber | html %]" class="[% normalized_isbn | html %]" id="gbs-thumbnail-preview"></div>
[% END %]
[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
- [% coce_id = normalized_ean || normalized_isbn | html %]
+ [% coce_id = normalized_ean || normalized_isbn %]
<div title="[% biblio.biblionumber | html %]" class="[% coce_id | html %]" id="coce-thumbnail-preview"></div>
[% END %]
[% IF OpenLibraryCovers %]
<div title="[% biblio.biblionumber | html %]" class="[% normalized_isbn | html %]" id="openlibrary-thumbnail-preview"></div>
[% END %]
- [% bt_id = ( normalized_upc || normalized_isbn ) | html %]
+ [% bt_id = ( normalized_upc || normalized_isbn ) %]
[% IF ( BakerTaylorEnabled && bt_id ) %]
[% IF BakerTaylorBookstoreURL %]
[% IF ( OPACURLOpenInNewWindow ) %]
@@ -168,7 +168,7 @@
[% END # /OPACPopupAuthorsSearch %]
[% FOREACH MARCAUTHOR IN MARCAUTHORS %]
- [% authorsloop = loop | html %]
+ [% authorsloop = loop %]
[% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
[% MARCAUTHOR_SUBFIELDS_LOO.separator | html %]
[% IF Koha.Preference( 'OPACPopupAuthorsSearch' ) == 1 %]
@@ -268,7 +268,7 @@
<b>All</b>
</label>
[% FOREACH MARCSUBJCT IN MARCSUBJCTS %]
- [% subjectsloop = loop | html %]
+ [% subjectsloop = loop %]
[% IF MARCSUBJCT.authoritylink %]
<ul id="subjectsList[% loop.count | html %]" data-authid="[% MARCSUBJCT.authoritylink | html %]">
[% ELSE %]
@@ -293,7 +293,7 @@
[% END # /OPACPopupAuthorsSearch%]
[% FOREACH MARCSUBJCT IN MARCSUBJCTS %]
- [% subjectsloop = loop | html %]
+ [% subjectsloop = loop %]
[% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %]
[% SUBFIELD.separator | html %]
[% IF Koha.Preference( 'OPACPopupAuthorsSearch' ) == 1 %]
@@ -1252,7 +1252,7 @@
<link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
<span class="[% ITEM_RESULT.home_branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]" title="">
[% IF Branches.GetURL( ITEM_RESULT.homebranch ) %]
- [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %]
+ [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %]
[% IF ( home_branch_url ) %]
<a href="[% home_branch_url | html %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a>
[% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index 8091efa..f53308d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -125,7 +125,7 @@
</thead>
<tbody>
[% FOREACH request IN requests %]
- [% status = request.status | html %]
+ [% status = request.status %]
<tr>
<td>[% request.id | html %]</td>
<td>
@@ -149,7 +149,7 @@
[% ELSIF method == 'view' %]
<h2>View interlibrary loan request</h2>
[% INCLUDE messages %]
- [% status = request.status | html %]
+ [% status = request.status %]
<form method="post" action="?method=update" id="illrequestupdate-form" novalidate="novalidate">
<fieldset class="rows">
<legend id="library_legend">Details from library</legend>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
index c577c50..242405c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
@@ -43,7 +43,7 @@
<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | html %]/SC.GIF&client=[% SyndeticsClientCode | html %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc | html %]&oclc=[% SEARCH_RESULT.normalized_oclc | html %]" alt="" />
[% END %][% END %][% END %]
-[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
+[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %]
[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></a>[% END %][% END %]
<p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %]
[% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index f571ebf..415737c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -12,9 +12,9 @@
[% INCLUDE 'masthead.inc' %]
[% IF Koha.Preference('AmazonAssocTag') %]
- [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %]
+ [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
[% ELSE %]
- [% AmazonAssocTag = '' | html %]
+ [% AmazonAssocTag = '' %]
[% END %]
<div class="main">
@@ -88,8 +88,8 @@
[% FOREACH issue IN READING_RECORD %]
<tr>
<td style="display:none;">
- [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' | html %]
- [% ELSE %][% issuetype = 'standard_checkout' | html %]
+ [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %]
+ [% ELSE %][% issuetype = 'standard_checkout' %]
[% END %]
[% issuetype | html %]
</td>
@@ -111,7 +111,7 @@
[% END %]
[% IF BakerTaylorEnabled %]
- [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %]
+ [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %]
[% IF ( bt_id ) %]
<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
[% ELSE %]
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 1d3742d..2b5588f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -254,7 +254,7 @@
[% END %]
[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
- [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn | html %]
+ [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn %]
[% IF ( coce_id ) %]
<span title="[% SEARCH_RESULT.biblionumber |url %]" class="[% coce_id | html %]" id="coce-thumbnail[% loop.count | html %]"></span>
[% ELSE %]
@@ -271,7 +271,7 @@
[% END %]
[% IF ( BakerTaylorEnabled && !BakerTaylorBookstoreURL ) %]
- [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
+ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %]
[% IF ( bt_id ) %]
<img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
[% ELSE %]
@@ -281,7 +281,7 @@
</a>
[% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %]
- [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
+ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %]
[% IF ( bt_id ) %]
<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]">
<img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index dae56ed..fb2112e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -328,7 +328,7 @@
[% END %]
[% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %]
- [% coce_id = itemsloo.normalized_ean || itemsloo.normalized_isbn | html %]
+ [% coce_id = itemsloo.normalized_ean || itemsloo.normalized_isbn %]
[% IF ( coce_id ) %]
<span title="[% itemsloo.biblionumber |url %]" class="[% coce_id | html %]" id="coce-thumbnail[% loop.count | html %]"></span>
[% ELSE %]
@@ -347,7 +347,7 @@
</a> <!-- / .p1 -->
[% IF ( BakerTaylorEnabled ) %]
- [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %]
+ [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %]
[% IF ( bt_id ) %]
<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
[% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
index 19900ab..8d6a8cf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
@@ -16,7 +16,7 @@
[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn | html %]/SC.GIF&client=[% SyndeticsClientCode | html %]&type=xw10&upc=[% review.normalized_upc | html %]&oclc=[% review.normalized_oclc | html %]" alt="" />
[% END %][% END %][% END %]
-[% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
+[% bt_id = ( review.normalized_upc || review.normalized_isbn ) %]
[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %]
[% IF ( review.author ) %]<p>By [% review.author | html %].</p> [% END %]
<p>[% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
index e33f098..c915cd3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
@@ -137,7 +137,7 @@
[% END %]
[% END %]
</a>
- [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %]
+ [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %]
[% IF ( BakerTaylorEnabled ) %]
[% IF ( bt_id ) %]
<a href="https://[% review.BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 9af74ba..d42aef8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -18,9 +18,9 @@
[% INCLUDE 'masthead.inc' %]
[% IF Koha.Preference('AmazonAssocTag') %]
- [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %]
+ [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %]
[% ELSE %]
- [% AmazonAssocTag = '' | html %]
+ [% AmazonAssocTag = '' %]
[% END %]
<div class="main">
@@ -228,7 +228,7 @@
[% END %]
[% IF ( BakerTaylorEnabled ) %]
- [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %]
+ [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %]
[% IF ( bt_id ) %]
<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
[% ELSE %]
@@ -503,7 +503,7 @@
[% END %]
[% IF ( BakerTaylorEnabled ) %]
- [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %]
+ [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %]
[% IF ( bt_id ) %]
<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>
[% ELSE %]
--
2.1.4