From 9e60f657aa7d2ba48f67bad7036a4b81d62fbf60 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 13 Sep 2023 02:25:13 +0000 Subject: [PATCH] Bug 33734: Remove incorrect URL escaping on search filters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch removes an incorrect URL escaping on search filter facet URLs. Without this patch, search filters using non-ASCII characters won't return results. To test: 0. Apply patch 1. Enable SavedSearchFilters syspref 2. Search for "the" 3. Save as search filter (to show on both OPAC and staff interface) 4. Search for "ü" in staff interface 5. Apply the "the" filter 6. Note that search results appear 7. Search for "ü" in OPAC 8. Apply the "the" filter 9. Note that search results appear Signed-off-by: Michaela Sieber Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 5 +++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index 3e708036f6..0dc74bbe9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -13,11 +13,12 @@
    [% SET base_url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %] [% FOREACH search_filter IN search_filters %] + [% SET search_filter_id = search_filter.id | uri %]
  • [% IF active_filters.${search_filter.id} %] - [% search_filter.name | html %][x] + [% search_filter.name | html %][x] [% ELSE %] - [% search_filter.name | html %] + [% search_filter.name | html %] [% END %]
  • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc index 94f9195246..736b2ef24c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -11,11 +11,12 @@
      [% SET base_url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %] [% FOREACH search_filter IN search_filters %] + [% SET search_filter_id = search_filter.id | uri %]
    • [% IF active_filters.${search_filter.id} %] - [% search_filter.name | html %][x] + [% search_filter.name | html %][x] [% ELSE %] - [% search_filter.name | html %] + [% search_filter.name | html %] [% END %]
    • [% END %] -- 2.30.2