From 2d25a0cf366a59e4e0819d69f3ce719877bd39d8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 6 Dec 2018 10:07:18 -0300 Subject: [PATCH] Bug 21950: Remove filtering for query_cgi and limit_cgi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We must not escape query_cgi and limit_cgi template-side, they are already escape properly from build_query_compat using uri_escape_utf8. To fix further problems we should replace all occurrences to make things clear (I decided to keep the html filter so far, which did not hurt, but uri or url do) Same patch as the following commit will be provided commit 2fc599c0893620c395ca0492c9d9e3c860c8f951 Bug 21526: Fix search result pages (url vs uri vs raw) query_cgi is uri_escaped from the pl, so we should displayed as raw Test plan: Use wide characters ❤ Search, filter, facets, search history, rss (both interfaces) --- koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/catalogue/search-history.tt | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc | 10 +++++----- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index e3795e7e90..4d0e3c4781 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -5,7 +5,7 @@

Refine your search

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 7a490d96fa..548c0c055c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -20,7 +20,7 @@ [% END %] [% END %] - + [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] @@ -45,7 +45,7 @@ No results found!

[% IF ( searchdesc ) %] - No results found for that in [% LibraryName | html %] catalog. Subscribe to this search + No results found for that in [% LibraryName | html %] catalog. Subscribe to this search [% ELSE %] You did not specify any search criteria. [% END %] @@ -89,7 +89,7 @@ [% END %] ). [% END %] - Subscribe to this search + Subscribe to this search [% END # / IF total %]

[% END # / IF searchdesc %] 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 0458cb669f..cb1277ee73 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 @@ -71,7 +71,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -111,7 +111,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -156,7 +156,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - [% s.query_desc | html %] + [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -193,7 +193,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - [% s.query_desc | html %] + [% s.query_desc | html %] [% s.total | html %] [% END %] -- 2.11.0