From ecdcbd74704ac82d5beba08604e672ef3de77a8f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 22 Apr 2021 14:33:25 +0000
Subject: [PATCH] Bug 28193: OpacLoginInstructions news block broken by Bug
 20168

This patch fixes a regression which was introduced by Bug 20168, causing
the OpacLoginInstructions template code to revert back to the old system
preference behavior. This patch returns the correct markup.

To test, apply the patch and view the OPAC login page
(/cgi-bin/koha/opac-user.pl)

 - With no news entry for OpacLoginInstructions you should see the
   default: A block of text with two headings, "Don't have a password
   yet?" and "Don't have a library card?"
 - Go to Tools -> News and create an entry for OpacLoginInstructions.
 - Return to the OPAC and confirm that your custom text appears.
 - Try updating/installing another translation and adding a different
   news entry for that language. Confirm that the correct entry appears.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit ee4755c97404e464b8d9af6cd2f253201c1f21d7)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index d5f142c86b..7204f407cf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -199,14 +199,14 @@
                                     </div>
                                 [% END %]
                                 <div id="nologininstructions">
-                                    [% IF Koha.Preference('OpacLoginInstructions') %]
-                                        [% Koha.Preference('OpacLoginInstructions') | $raw %]
+                                    [% IF ( OpacLoginInstructions ) %]
+                                        [% PROCESS koha_news_block news => OpacLoginInstructions %]
                                     [% ELSE %]
                                         <h3>Don't have a password yet?</h3>
                                         <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
                                         <h3>Don't have a library card?</h3>
                                         <p>If you don't have a library card, stop by your local library to sign up.</p>
-                                    [% END # / IF Koha.Preference('OpacLoginInstructions') %]
+                                    [% END # / IF  OpacLoginInstructions %]
 
                                     [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
                                         <span id="registrationinstructions">
-- 
2.39.5