From 5f6391882deb84dbad922ee82d53b7405c0dbb4a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 27 May 2011 08:54:06 -0400 Subject: [PATCH] Fix for Bug 5714 - Unescaped ampersands in OPAC facets In the OPAC the "query_cgi" variable passed to the template outputs a string like this: idx=kw&q=thing The ampersand is unescaped. Adding an "|html" filter to the variable. Also correcting some TT markup which added a new validation error (an unopened
). Signed-off-by: Magnus Enger Signed-off-by: Chris Cormack (cherry picked from commit a53ae578b428a3cddd2802a972ee048b479a44aa) Signed-off-by: Chris Nighswonger --- koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc | 7 ++++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc index eac00aa7fb..4931283cf0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc @@ -2,8 +2,9 @@ [% IF ( facets_loop ) %]

Refine your search

+[% query_cgi %]
    -
  • Availability +
  • Availability [% IF ( related ) %]
  • (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %])
  • [% END %] @@ -18,8 +19,8 @@ [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] [% END %]
      - [% FOREACH facet IN facets_loo.facets %]
    • [% facet.facet_label_value %] [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]
    • [% END %][% IF ( facets_loo.expandable ) %] -
    • Show More
    • + [% FOREACH facet IN facets_loo.facets %]
    • [% facet.facet_label_value %] [% IF ( facet.displayFacetCount ) %]([% facet.facet_count %])[% END %]
    • [% END %][% IF ( facets_loo.expandable ) %] +
    • Show More
    • [% END %]
    [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index 31ae76aa53..b33f4a42d9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -499,7 +499,7 @@ $(document).ready(function(){ [% ELSIF ( loop.first ) %]Log in to add tags. [% END %] [% END %] - [% IF ( SEARCH_RESULT.TagLoop ) %] + [% IF ( SEARCH_RESULT.TagLoop.size ) %]
[% END %] [% END %] [% END %][% END %] -- 2.39.5