Attachment 83561 Details for Bug 22007 – Bug 22007: Remove html filters when KohaDates called with a parameter

[patch] Bug 22007: Remove html filters when KohaDates called with a parameter

Bug-22007-Remove-html-filters-when-KohaDates-calle.patch (text/plain), 32.97 KB, created by Katrin Fischer on 2019-01-01 22:02:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2019-01-01 22:02:18 UTC

Size: 32.97 KB

patch

obsolete

>From 844c4402a392bae7f957724187b20e6abdc4e782 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 14 Dec 2018 17:20:52 -0300
>Subject: [PATCH] Bug 22007: Remove html filters when KohaDates called with a
> parameter
>
>Bug 13618 took care of the KohaDates output but not if it is called
>with a parameter (eg. [% var | $KohaDates with_hours => 1 %]).
>
>We could avoid unnecessary processing by removing the extra html filter.
>
>Patch generated with the following command:
> % perl -p -i -e 's/KohaDates([^%\|]*)\s?\|\s?html\s?/KohaDates $1/g' **/*.inc **/*.tt
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 8 ++++----
> .../intranet-tmpl/prog/en/modules/catalogue/search-history.tt | 8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 4 ++--
> .../intranet-tmpl/prog/en/modules/members/accountline-details.tt | 4 ++--
> .../intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt | 8 ++++----
> .../intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 8 ++++----
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +++---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++--
> 20 files changed, 39 insertions(+), 39 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index bffb1eae3d..8c0128a149 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>@@ -114,7 +114,7 @@
> [% END %]
> <tr>
> <th scope="row">Date and time: </th>
>- <td>[% current_date_and_time | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% current_date_and_time | $KohaDates with_hours => 1 %]</td>
> </tr>
> <tr>
> [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>index 54a701103f..b98175a1d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -31,7 +31,7 @@
> 
> [% IF ( batch_details ) %]
> <h1>Add orders from [% comments | html %]
>- ([% file_name | html %] staged on [% upload_timestamp | $KohaDates with_hours => 1 | html %])
>+ ([% file_name | html %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
> </h1>
> <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
> <div id="tabs" class="toptabs">
>@@ -411,7 +411,7 @@
> [% batch_lis.import_status | html %]
> [% END %]
> </td>
>- <td>[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% batch_lis.staged_date | $KohaDates with_hours => 1 %]</td>
> <td>[% batch_lis.num_records | html %]</td>
> <td><a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]">Add orders</a></td>
> </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>index 637686b7ff..196d76b58e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>@@ -81,7 +81,7 @@
> </td>
> <td>
> [% IF ( lateorder.estimateddeliverydate ) %]
>- [% lateorder.estimateddeliverydate | $KohaDates | html %]
>+ [% lateorder.estimateddeliverydate | $KohaDates %]
> [% ELSE %]
> 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>index 0b0ce8019a..639c694497 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -66,23 +66,23 @@
> &nbsp;
> [% END %]</td>
> <td>[% IF checkout.renewals %]
>- Yes[% IF checkout.lastreneweddate %], last on: [% checkout.lastreneweddate |$KohaDates with_hours => 1 | html %]
>+ Yes[% IF checkout.lastreneweddate %], last on: [% checkout.lastreneweddate |$KohaDates with_hours => 1 %]
> [% END %]
> [% ELSE %]
> No
> [% END %]</td>
> <td>[% IF checkout.issuedate %]
>- [% checkout.issuedate |$KohaDates with_hours => 1 | html %]
>+ [% checkout.issuedate |$KohaDates with_hours => 1 %]
> [% ELSE %]
> 
> [% END %]</td>
> <td>[% IF checkout.date_due %]
>- [% checkout.date_due |$KohaDates with_hours => 1 | html %]
>+ [% checkout.date_due |$KohaDates with_hours => 1 %]
> [% ELSE %]
> 
> [% END %]</td>
> <td>[% IF checkout.returndate %]
>- [% checkout.returndate |$KohaDates with_hours => 1 | html %]
>+ [% checkout.returndate |$KohaDates with_hours => 1 %]
> [% ELSE %]
> Checked out
> [% END %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>index 389d8f95b2..f360c1d40d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>@@ -56,7 +56,7 @@
> [% FOREACH s IN current_biblio_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -93,7 +93,7 @@
> [% FOREACH s IN previous_biblio_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -136,7 +136,7 @@
> [% FOREACH s IN current_authority_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -173,7 +173,7 @@
> [% FOREACH s IN previous_authority_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>index 51060d672b..57f54a89cc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt
>@@ -49,7 +49,7 @@
> <td>[% library.branchname | html %]</td>
> <td>[% library.issues | html %]</td>
> <td>[% IF library.seen %]
>- [% library.seen | $KohaDates with_hours => 1 | html %]
>+ [% library.seen | $KohaDates with_hours => 1 %]
> [% ELSE %]
> Never
> [% END %]
>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 6700b0e581..3c5a777dc9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -1020,7 +1020,7 @@ No patron matched [% message | html %]
> // On-site checkout
> function toggle_onsite_checkout(){
> if ( $("#onsite_checkout").prop('checked') ) {
>- $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1 | html %]")
>+ $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1 %]")
> [% IF !Koha.Preference('SpecifyDueDate') %]
> $("#duedatespec").datetimepicker('destroy');
> [% 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 f2a833f4f0..a004540065 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
>@@ -449,7 +449,7 @@
> </li>
> <li class="updated">
> <label class="updated">Last updated:</label>
>- [% request.updated | $KohaDates with_hours => 1 | html %]
>+ [% request.updated | $KohaDates with_hours => 1 %]
> </li>
> <li class="medium">
> <label class="medium">Request type:</label>
>@@ -559,7 +559,7 @@
> </li>
> <li class="updated">
> Last updated:
>- [% request.updated | $KohaDates with_hours => 1 | html %]
>+ [% request.updated | $KohaDates with_hours => 1 %]
> </li>
> <li class="medium">
> Request type:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>index ae66f7ed52..48292b55f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
>@@ -108,13 +108,13 @@
> [% IF offset_accountline %]
> <tr>
> <td>[% offset_accountline.date | $KohaDates %]</td>
>- <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 %]</td>
> <td>[% offset_accountline.amount | $Price %]</td>
> <td>[% offset_accountline.amountoutstanding | $Price %]</td>
> <td>[% PROCESS account_type_description account=offset_accountline %]</td>
> <td>[% offset_accountline.note | html %]</td>
> <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
>- <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% ao.created_on | $KohaDates with_hours => 1 %]</td>
> <td>[% ao.amount | $Price %]</td>
> <td>[% PROCESS offset_type_description account_offset=ao %]</td>
> <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"> Details</a></td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>index 3df5ab4ee5..dcf0cb4a33 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>@@ -56,7 +56,7 @@
> <td>[% issue.author | html %]</td>
> <td>[% issue.itemcallnumber | html %]</td>
> <td>[% issue.itemtype_description | html %]</td>
>- <td>[% issue.date_due | $KohaDates as_due_date => 1 | html %]</td>
>+ <td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td>
> <td>[% issue.barcode | html %]</td>
> <td>[% issue.charge | html %]</td>
> <td>[% issue.replacementprice | html %]</td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>index 84bd4554de..649026da91 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
>@@ -73,7 +73,7 @@
> </div>
> [% END %]
> </td>
>- <td>[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td>
> 	 </tr>
> 	 [% END %]
> 	</tbody>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index dcc722ca42..1a499b5244 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -70,7 +70,7 @@
> [% issuetype | html %]
> </td>
> <td>
>- [% issue.issuestimestamp | $KohaDates with_hours => 1 | html %]
>+ [% issue.issuestimestamp | $KohaDates with_hours => 1 %]
> </td>
> <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | uri %]">[% issue.title | html %]</a></td>
> 
>@@ -87,19 +87,19 @@
> <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% issue.itemnumber | uri %]&amp;biblionumber=[% issue.biblionumber | uri %]&amp;bi=[% issue.biblioitemnumber | uri %]#item[% issue.itemnumber | uri %]">[% issue.barcode | html %]</a></td>
> <td>[% issue.renewals | html %]</td>
> <td>
>- [% issue.issuedate |$KohaDates with_hours => 1 | html %]
>+ [% issue.issuedate |$KohaDates with_hours => 1 %]
> </td>
> <td>[% Branches.GetName( issue.branchcode ) | html %]</td>
> <td>
> [% IF issue.date_due %]
>- [% issue.date_due |$KohaDates with_hours => 1 | html %]
>+ [% issue.date_due |$KohaDates with_hours => 1 %]
> [% ELSE %]
> 
> [% END %]
> </td>
> <td>
> [% IF issue.returndate %]
>- [% issue.returndate |$KohaDates with_hours => 1 | html %]
>+ [% issue.returndate |$KohaDates with_hours => 1 %]
> [% ELSE %]
> Checked out
> [% END %]
>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 8a219131c3..18410c2be1 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
>@@ -223,8 +223,8 @@ canned reports and writing custom SQL reports.
> <td>[% savedreport.notes | html %]</td>
> <td>[% savedreport.borrowersurname | html %][% IF ( savedreport.borrowerfirstname ) %], [% savedreport.borrowerfirstname | html %][% END %] ([% savedreport.borrowernumber | html %])</td>
> <td>[% savedreport.date_created | $KohaDates %]</td>
>- <td>[% savedreport.last_modified | $KohaDates with_hours => 1 | html %]</td>
>- <td>[% savedreport.last_run | $KohaDates with_hours => 1 | html %]</td>
>+ <td>[% savedreport.last_modified | $KohaDates with_hours => 1 %]</td>
>+ <td>[% savedreport.last_run | $KohaDates with_hours => 1 %]</td>
> <td class="report_public">
> [% IF (savedreport.public) %]
> Yes
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 2b08c1aca7..9ed0bd84a5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -383,7 +383,7 @@
> [% END %]
> <td>
> [% IF ( itemloo.onloan ) %]
>- Due [% itemloo.date_due | $KohaDates as_due_date => 1 | html %]
>+ Due [% itemloo.date_due | $KohaDates as_due_date => 1 %]
> [% ELSE %]
> 
> [% IF ( itemloo.transfertwhen ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>index 150721d3bd..1e90cf88a9 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
>@@ -76,7 +76,7 @@
> <td>[% cr.item.itemcallnumber | html %]</td>
> <td>[% cr.item.copynumber | html %]</td>
> <td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
>- <td>[% cr.issue.date_due | $KohaDates as_due_date => 1 | html %]</td>
>+ <td>[% cr.issue.date_due | $KohaDates as_due_date => 1 %]</td>
> <td>[% IF ( cr.public_note ) %]
> [% cr.public_note | html %]
> [% ELSIF ( cr.item.itemnotes ) %]
>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 4c3641b78f..955a2f4a36 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -1339,7 +1339,7 @@
> [% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber | html %]</td>[% END %]
> <td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
> [% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes | html %]</td>[% END %]
>- <td class="date_due">[% ITEM_RESULT.datedue | $KohaDates as_due_date => 1 | html %]</td>
>+ <td class="date_due">[% ITEM_RESULT.datedue | $KohaDates as_due_date => 1 %]</td>
> <td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode | html %]</td>
> [% IF holds_count.defined || show_priority %]
> <td class="holds_count">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>index 3628f10eeb..7d238ed7cd 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
>@@ -171,7 +171,7 @@
> [% UNLESS hidden.defined('dateexpiry') %]
> <li>
> <label>Expiration date:</label>
>- [% borrower.dateexpiry | $KohaDates | html %]
>+ [% borrower.dateexpiry | $KohaDates %]
> </li>
> [% END %]
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>index cb1277ee73..ff9f72d5cd 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>@@ -70,7 +70,7 @@
> [% FOREACH s IN current_biblio_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -110,7 +110,7 @@
> [% FOREACH s IN previous_biblio_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;[% s.query_cgi | $raw %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -155,7 +155,7 @@
> [% FOREACH s IN current_authority_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>@@ -192,7 +192,7 @@
> [% FOREACH s IN previous_authority_searches %]
> <tr>
> <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>- <td>[% s.time |$KohaDates with_hours => 1 | html %]</td>
>+ <td>[% s.time |$KohaDates with_hours => 1 %]</td>
> <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
> <td>[% s.total | html %]</td>
> </tr>
>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 bf5738ef14..7af3a0f8c8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -258,14 +258,14 @@
> <td class="date_due overdue">
> 
> Date due:
>- [% ISSUE.date_due | $KohaDates as_due_date => 1 | html %]
>+ [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
> 
> </td>
> [% ELSE %]
> <td class="date_due">
> 
> Date due:
>- [% ISSUE.date_due | $KohaDates as_due_date => 1 | html %]
>+ [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
> 
> </td>
> [% END %]
>@@ -553,7 +553,7 @@
> <td>
> 
> Date due:
>- [% OVERDUE.date_due | $KohaDates as_due_date => 1 | html %]
>+ [% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
> 
> </td>
> [% IF ( OpacRenewalAllowed ) %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index fb6ce8c82b..df09322dc4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -248,9 +248,9 @@
> </td>
> <td>[% ISSUE.itemcallnumber | html %]</td>
> [% IF ( ISSUE.overdue ) %]
>- <td class="overdue">[% ISSUE.date_due | $KohaDates as_due_date => 1 | html %]</td>
>+ <td class="overdue">[% ISSUE.date_due | $KohaDates as_due_date => 1 %]</td>
> [% ELSE %]
>- <td>[% ISSUE.date_due | $KohaDates as_due_date => 1 | html %]</td>
>+ <td>[% ISSUE.date_due | $KohaDates as_due_date => 1 %]</td>
> [% END %]
> <td>
> <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22007: 83248 | 83249 | 83250 | 83251 | 83286 | 83287 | 83288 | 83289 | 83561 | 83562 | 83563 | 83564