From badce17ca29d55210b1f1940d84e6b1a7195cd20 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 28 Aug 2018 21:41:26 +0000 Subject: [PATCH] Bug 14715: (QA Follow up) Fix results not showing This fixes the display issue for me. Can someone please test? Signed-off-by: Cab Vinton Signed-off-by: Liz Rea --- catalogue/search.pl | 5 +---- opac/opac-search.pl | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index c27e04b..e093993 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -453,10 +453,7 @@ for (my $ii = 0; $ii < @operands; ++$ii) # Params that can only have one value my $scan = $params->{'scan'}; my $count = C4::Context->preference('numSearchResults') || 20; -my $results_per_page = $count; -if ( C4::Context->preference('numSearchResultsDropdown') ){ - $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page"); -} +my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; my $page = $cgi->param('page') || 1; my $offset = $params->{'offset'} || 0; $offset = 0 if $offset < 0; diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 27d80ba..efd425b 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -523,10 +523,7 @@ if ($params->{'limit-yr'}) { my $scan = $params->{'scan'}; my $count = C4::Context->preference('OPACnumSearchResults') || 20; my $countRSS = C4::Context->preference('numSearchRSSResults') || 50; -my $results_per_page = $count; -if ( C4::Context->preference('OPACnumSearchResultsDropdown') ){ - $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page"); -} +my $results_per_page = $params->{'results_per_page'} || $cgi->cookie("results_per_page") || $count; my $page = $cgi->param('page') || 1; my $offset = $params->{'offset'} || 0; $offset = 0 if $offset < 0; -- 2.1.4