From 6b4133433cdf6a57331bbef1bd5d8f27c70b4b7b Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 1 Apr 2020 15:13:06 -0400 Subject: [PATCH] Bug 23173: (follow-up) Fix QA script errors Signed-off-by: Kyle M Hall --- Koha.pm | 20 +++++++++---------- .../en/includes/ill-availability-table.inc | 6 +++--- .../prog/en/modules/ill/ill-requests.tt | 8 ++++---- .../en/includes/ill-availability-table.inc | 8 ++++---- .../bootstrap/en/modules/opac-illrequests.tt | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Koha.pm b/Koha.pm index bc6030bc57..9116a49031 100644 --- a/Koha.pm +++ b/Koha.pm @@ -5,18 +5,18 @@ package Koha; # # This file is part of Koha. # -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 3 of the License, or (at your option) any later +# version. # -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use Modern::Perl; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc index 69e6679edc..e609b6b287 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc @@ -1,6 +1,6 @@
- - +
+ @@ -10,7 +10,7 @@ - +
Source TitleDate
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 39768608b5..deebddf5c5 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 @@ -332,7 +332,7 @@ [% FOR service IN services %] -

[% service.name %]

+

[% service.name | html %]

[% INCLUDE 'ill-availability-table.inc' service=service %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc index a2597bc3cf..bd99743147 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc @@ -1,7 +1,7 @@
-
[% service.name %]
- - +
[% service.name | html %]
+
+ @@ -11,7 +11,7 @@ - +
Source TitleDate
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 77fa2aaa22..b9611a1603 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -239,8 +239,8 @@ [% custom_values = whole.custom_value.split('\0') %] [% i = 0 %] [% FOREACH custom_key IN custom_keys %] - - + + [% i = i + 1 %] [% END %] @@ -251,7 +251,7 @@ [% FOR service IN services %] -

[% service.name %]

+

[% service.name | html %]

[% INCLUDE 'ill-availability-table.inc' service=service %] [% END %] -- 2.24.1 (Apple Git-126)