From e6b94768d343e02885c59d00b74fadc927f88f8c Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 4 Oct 2016 03:02:01 +0000 Subject: [PATCH] Bug 14715: Fixing merge conflicts etc. To test: 1) Do a catalog search in the intranet and OPAC 2) Confirm that results automatically update upon selection of results per page to show 3) Test for all options (20, 40, 60, 80, 100, all) --- catalogue/search.pl | 1 - opac/opac-search.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 48f264f..336d868 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -626,7 +626,6 @@ for (my $i=0;$i<@servers;$i++) { if ($query_desc || $limit_desc) { $template->param(searchdesc => 1); } - $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; $template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); $template->param(results_per_page_options => \@results_per_page_options); # must define a value for size if not present in DB diff --git a/opac/opac-search.pl b/opac/opac-search.pl index fce9c68..358915b 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -791,7 +791,6 @@ for (my $i=0;$i<@servers;$i++) { if ($query_desc || $limit_desc) { $template->param(searchdesc => 1); } - $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed; $template->param(results_per_page => $results_per_page == $hits ? 'all' : $results_per_page); my $hide = C4::Context->preference('OpacHiddenItems'); $hide = ($hide =~ m/\S/) if $hide; # Just in case it has some spaces/new lines -- 2.1.4