@@ -, +, @@
---
C4/Search.pm | 4 ++--
catalogue/search.pl | 4 +++-
koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 5 +++--
koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc | 5 +++--
opac/opac-search.pl | 2 +-
5 files changed, 12 insertions(+), 8 deletions(-)
--- a/C4/Search.pm
+++ a/C4/Search.pm
@@ -1549,7 +1549,7 @@ sub buildQuery {
$group_OR_limits{$k} .= " or " if $group_OR_limits{$k};
$limit_desc .= " or " if $group_OR_limits{$k};
$group_OR_limits{$k} .= "$this_limit";
- $limit_cgi .= "&limit=$this_limit";
+ $limit_cgi .= "&limit=" . uri_escape($this_limit);
$limit_desc .= " $this_limit";
}
@@ -1557,7 +1557,7 @@ sub buildQuery {
else {
$limit .= " and " if $limit || $query;
$limit .= "$this_limit";
- $limit_cgi .= "&limit=$this_limit";
+ $limit_cgi .= "&limit=" . uri_escape($this_limit);
if ($this_limit =~ /^branch:(.+)/) {
my $branchcode = $1;
my $branchname = GetBranchName($branchcode);
--- a/catalogue/search.pl
+++ a/catalogue/search.pl
@@ -153,6 +153,8 @@ use POSIX qw(ceil floor);
use String::Random;
use C4::Branch; # GetBranches
+use URI::Escape;
+
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
# create a new CGI object
# FIXME: no_undef_params needs to be tested
@@ -512,7 +514,7 @@ for my $this_cgi ( split('&',$limit_cgi) ) {
my $input_name = $1;
my $input_value = $2;
$input_name =~ s/=$//;
- push @limit_inputs, { input_name => $input_name, input_value => $input_value };
+ push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -28,13 +28,14 @@
[% IF ( sort_by ) %]
[% SET url = url _ "&sort_by=" _ sort_by %]
[% END %]
+ [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
[% facet.facet_label_value %]
- [x]
+ [x]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
- [% facet.facet_label_value %]
+ [% facet.facet_label_value %]
[% IF ( displayFacetCount ) %]
([% facet.facet_count %])
[% END %]
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -29,13 +29,14 @@
[% IF ( sort_by ) %]
[% SET url = url _ "&sort_by=" _ sort_by |html %]
[% END %]
+ [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
[% facet.facet_label_value %]
- [x]
+ [x]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
- [% facet.facet_label_value %]
+ [% facet.facet_label_value %]
[% IF ( displayFacetCount ) %]
([% facet.facet_count %])
[% END %]
--- a/opac/opac-search.pl
+++ a/opac/opac-search.pl
@@ -456,7 +456,7 @@ sub _input_cgi_parse {
for my $this_cgi ( split('&',shift) ) {
next unless $this_cgi;
$this_cgi =~ /(.*?)=(.*)/;
- push @elements, { input_name => $1, input_value => $2 };
+ push @elements, { input_name => $1, input_value => uri_unescape($2) };
}
return @elements;
}
--