From 33af36ff94f9b7a02d65055916f28a58b15c1c8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Wed, 7 Dec 2011 08:46:21 +0100 Subject: [PATCH] Bug 7328 Expanded options in advanced search In OPAC and intra advanced search, more search options are displayed depending on expandedSearchOption syspres and user choice. This doesn't work anymore in HEAD. This patch restore this functionnality. To test: - enable/disable expandedSearchOption. - Load advanced search page. Limited seach options version is always displayed - Apply this patch and see how it works... Signed-off-by: Katrin Fischer The problem only appeared in the staff client for me. Tested both OPAC and staff with patch applied. Signed-off-by: Paul Poulain (cherry picked from commit 1730e180cdbe11a7878ddfab54cec7291d12f430) Signed-off-by: Chris Nighswonger --- catalogue/search.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 4792f0b1d7..30133200e9 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -331,13 +331,13 @@ if ( $template_type eq 'advsearch' ) { my $languages_limit_loop = getAllLanguages(); $template->param(search_languages_loop => $languages_limit_loop,); - # use the global setting by default - if ( C4::Context->preference("expandedSearchOption") == 1) { - $template->param( expanded_options => C4::Context->preference("expandedSearchOption") ); - } - # but let the user override it - if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) { - $template->param( expanded_options => $cgi->param('expanded_options')); + # Expanded search options in advanced search: + # use the global setting by default, but let the user override it + { + my $expanded = $cgi->param('expanded_options'); + $expanded = C4::Context->preference("expandedSearchOption") || 0 + if !defined($expanded) || $expanded !~ /^0|1$/; + $template->param( expanded_options => $expanded ); } $template->param(virtualshelves => C4::Context->preference("virtualshelves")); -- 2.39.5