From 062c3f9ab2e25b64dad1d4356a976a1416204c05 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 6 Sep 2019 09:02:38 +0000 Subject: [PATCH] Bug 16111: (QA follow-up) Changes related to partial revert When reverting the & change, we need to go back to html filter for query_cgi and limit_cgi. In this patch I only replaced it where it is needed. The template contains more references to SEARCH_RESULT.query_cgi and SEARCH_RESULT.limit_cgi which are useless, since searchResults does not return these hash keys at all. This patch fixes one occurrence where SEARCH_RESULT was copied outside the loop that defines the template variable. Obviously, the code for RSS still needs more attention. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize --- .../opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 bc26e9db5d..d25c3747b5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -23,8 +23,8 @@ xmlns:atom="http://www.w3.org/2005/Atom"> <![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]> - [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=rss - + [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss + [% total | html %] [% offset | html %] @@ -81,9 +81,9 @@ [% IF ( atom ) %] - [% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=atom + [% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom [% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] - + [% timestamp | html %] [% LibraryName | html %] -- 2.39.5