From 0bb19c95f7aa51a6de8d8cb1790bad7980dacfff Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 13 Jul 2015 15:44:23 +0100 Subject: [PATCH] Bug 14524: Don't escape query_cgi with uri According to the doc, we should not escape query_cgi with the uri filter: http://www.template-toolkit.org/docs/manual/Filters.html#section_uri Since query_cgi can contains something like: "idx=kw&q=42", we should not escape the & char Test plan: 0/ Don't apply the patch 1/ Go on launch a search at the OPAC 2/ Click on the RSS icon 3/ You should arrive on opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2 The & has been escaped. 4/ Apply the patch 5/ Now you should get result and see an url correctly formatted. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit ff280e01f4927d3860ec3d607e8d3be310dd358b) Signed-off-by: Chris Cormack --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 a212bf83b0..6bcb58261f 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 %] @@ -85,7 +85,7 @@ [% END %] ). [% END %] - Subscribe to this search + Subscribe to this search [% END # / IF total %]

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