From 08af6f158c6ee367f750e0f06bd525699b6ca979 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Wed, 23 Jul 2014 15:52:15 +0200 Subject: [PATCH] Bug 11944: remove url/uri filter from query_cgi We don't need to pass query_cgi through url (or uri) filter since this will turn query string (correctly escaped inside code) back into two-byte escaped string which CGI( -utf8 ) won't turn back into proper utf-8 Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 9462fa1..ef6da75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -140,7 +140,7 @@ $('#sort_by').change(function() { [%- END -%] ]; var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); - browser.create([% SEARCH_RESULTS.first.result_number %], '[% query_cgi | uri %]', '[% limit_cgi | uri %]','[% sort_cgi | uri %]', + browser.create([% SEARCH_RESULTS.first.result_number %], '[% query_cgi %]', '[% limit_cgi | uri %]','[% sort_cgi | uri %]', newresults, '[% total %]'); [% END %] [% IF (gotoPage && gotoNumber) %] 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 e1b69a5..6e846f0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc @@ -6,9 +6,9 @@ @@ -32,7 +32,7 @@
    [% FOREACH facet IN facets_loo.facets %]
  • - [% SET query_cgi_f = query_cgi | url %] + [% SET query_cgi_f = query_cgi %] [% SET limit_cgi_f = limit_cgi | url %] [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi_f _ limit_cgi_f %] [% IF ( sort_by ) %] @@ -54,7 +54,7 @@ [% END %] [% IF ( facets_loo.expandable ) %]
  • - Show more
  • [% END %] 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 72a3a89..9a15d84 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -16,7 +16,7 @@ [% END %] [% END %] - + [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] @@ -41,7 +41,7 @@ No results found!

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

    [% END # / IF searchdesc %] -- 2.1.0