From 7d47100bcdbcd5acd2c4cbbbdbccfdee0513f3ba Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 19 Aug 2019 18:24:56 -0400 Subject: [PATCH] Bug 16111: Replace & with & --- C4/Search.pm | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 2 +- opac/opac-search.pl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index 4c4a3d0e10..79e87c4683 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1808,9 +1808,9 @@ sub _build_initial_query { #e.g. " and kw,wrdl:test" $params->{query} .= $operator . $operand; - $params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator; - $params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index}; - $params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand}; + $params->{query_cgi} .= "&op=".uri_escape_utf8($operator) if $operator; + $params->{query_cgi} .= "&idx=".uri_escape_utf8($params->{index}) if $params->{index}; + $params->{query_cgi} .= "&q=".uri_escape_utf8($params->{original_operand}) if $params->{original_operand}; #e.g. " and kw,wrdl: test" $params->{query_desc} .= $operator . $params->{index_plus} . " " . $params->{original_operand}; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index 2267d4718b..5496dec0c5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -23,7 +23,7 @@ xmlns:atom="http://www.w3.org/2005/Atom"> <![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]> - + [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=rss [% total | html %] diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 55fe17f006..450362d546 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -570,7 +570,7 @@ unless ( $cgi->param('advsearch') ) { sub _input_cgi_parse { my @elements; my $query_cgi = shift or return @elements; - for my $this_cgi ( split('&',$query_cgi) ) { + for my $this_cgi ( split('&',$query_cgi) ) { next unless $this_cgi; $this_cgi =~ /(.*?)=(.*)/; push @elements, { input_name => $1, input_value => Encode::decode_utf8( uri_unescape($2) ) }; @@ -608,7 +608,7 @@ my $results_hashref; my @coins; if ($tag) { - $query_cgi = "tag=" . uri_escape_utf8( $tag ) . "&" . $query_cgi; + $query_cgi = "tag=" . uri_escape_utf8( $tag ) . "&" . $query_cgi; my $taglist = get_tags({term=>$tag, approved=>1}); $results_hashref->{biblioserver}->{hits} = scalar (@$taglist); my @marclist = map { C4::Biblio::GetXmlBiblio( $_->{biblionumber} ) } @$taglist; @@ -745,7 +745,7 @@ for (my $i=0;$i<@servers;$i++) { my $path_info = $cgi->url(-path_info=>1); my $query_cgi_history = $cgi->url(-query=>1); $query_cgi_history =~ s/^$path_info\?//; - $query_cgi_history =~ s/;/&/g; + $query_cgi_history =~ s/;/&/g; my $query_desc_history = join ", ", grep { defined $_ } $query_desc, $limit_desc; unless ( $borrowernumber ) { -- 2.11.0