From 60af6edbb15df1a6c667eb0cf547268b408eeb18 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Sat, 24 Oct 2020 00:33:32 +0000
Subject: [PATCH] Bug 26810: Restore OpacCustomSearch news display

To test:
1 - Define a new opac news entry for OpacCustomSearch
2 - Browse opac, notice the standard search bar is displayed
3 - Apply patch
4 - Note new search bar displays on refresh

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index bcba20c4b1..e3895a1e76 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -156,7 +156,9 @@
                 <div class="row">
                     <div class="col">
                             <div id="opac-main-search">
-                                [% IF Koha.Preference('OpacCustomSearch') == '' %]
+                                [% IF ( OpacCustomSearch ) %]
+                                    [% PROCESS koha_news_block news => OpacCustomSearch %]
+                                [% ELSE %]
                                     <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
                                         <div class="form-row align-items-center">
                                             <div class="col-sm-auto order-1 order-sm-1">
@@ -282,9 +284,7 @@
                                         </div> <!-- /.form-row -->
                                         <input type="hidden" name="weight_search" value="1">
                                     </form>
-                                [% ELSE # / Koha.Preference('OpacCustomSearch') == '' %]
-                                    [% Koha.Preference('OpacCustomSearch') | $raw %]
-                                [% END # / Koha.Preference('OpacCustomSearch') == '' %]
+                                [% END # / ( OpacCustomSearch ) %]
                             </div><!-- /#opac-main-search -->
                     </div> <!-- /.col -->
                 </div> <!-- /.row -->
-- 
2.39.5