From ee7ba48bfe9d3f43bbc1bb88f62bf12854e5a838 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 5 Aug 2019 09:02:15 -0500
Subject: [PATCH] Bug 23253: (bug 22318 follow-up) Fix OpacNavRight even if
 opacuserlogin is off

There are other occurrences of OpavNavRight that bug 22318 forgot to
adjust to use the news system instead of the syspref.

Test plan:
- turn off opacuserlogin
- create a news for OpacNavRight
- go to the opac main page
=> Confirm that the OpacNavRight content is displayed correctly.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index b48e92284f..0150881623 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -42,6 +42,7 @@
         </div>
     [% END %]
 
+    [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
     [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
         <div class="span7">
     [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
@@ -213,7 +214,7 @@
                         [% END %]
                     [% END # /loggedinusername %]
                 [% END # /opacuserlogin %]
-                [% PROCESS koha_news_block news => KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
+                [% PROCESS koha_news_block news => OpacNavRight %]
             </div> <!-- / .span3 -->
         [% END # /opacuserlogin || OpacNavRight %]
 
-- 
2.39.5