We need to adjust a few query_cgi | uri filters here too.
Note that sort_by should be filtered by uri, not url.
Similar change on staff side.
Test plan:
Toggle Show all items/Limit available items.
Check: git grep -l "query_cgi | uri"
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
<div id="search-facets">
<h4>Refine your search</h4>
<ul>
- <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul>
+ <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | url %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | url %][% limit_cgi | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul>
[% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %]
</li>
<ul>
<li>
[% IF ( available ) %]
- <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>
+ <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %]">Show all items</a>
[% ELSE %]
- <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items.</a>
+ <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |uri %][% END %]&limit=available">Limit to currently available items.</a>
[% END %]
</li>
</ul>