From 52f58f2ec0e9f0270c807cccd95749e853a8d64a Mon Sep 17 00:00:00 2001 From: Charlotte Cordwell Date: Thu, 18 Jan 2018 01:29:05 +0000 Subject: [PATCH] Bug 19892: Replace numbersphr variable with Koha.Preference('OPACNumbersPreferPhrase') in OPAC Test Case 1) Check that the following files have been changed properly. opac/opac-search.pl opac/opac-main.pl koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt 2)Apply bug 3) Check that there are no differences in behaviour as a result of the patch. Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt | 4 ++-- opac/opac-main.pl | 4 ---- opac/opac-search.pl | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index 1705184feb..f5308ea7e2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -54,7 +54,7 @@ [% IF ( expanded_options ) %] - [% IF ( numbersphr) %] + [% IF ( Koha.Preference('OPACNumbersPreferPhrase') ) %] [% ELSE %] @@ -79,7 +79,7 @@ [% IF ( expanded_options ) %] - [% IF ( numbersphr) %] + [% IF ( Koha.Preference('OPACNumbersPreferPhrase') ) %] [% ELSE %] diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 723dced66c..2398b6a4aa 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -102,8 +102,4 @@ if (C4::Context->preference('GoogleIndicTransliteration')) { $template->param('GoogleIndicTransliteration' => 1); } -if (C4::Context->preference('OPACNumbersPreferPhrase')) { - $template->param('numbersphr' => 1); -} - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/opac/opac-search.pl b/opac/opac-search.pl index f06e40a6fa..82a0319b82 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -380,9 +380,6 @@ if ( $template_type && $template_type eq 'advsearch' ) { } } - if (C4::Context->preference('OPACNumbersPreferPhrase')) { - $template->param('numbersphr' => 1); - } output_html_with_http_headers $cgi, $cookie, $template->output; exit; -- 2.39.5