From 993e907aa37b34929cde36c22746bad802f3284d Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 4 Aug 2022 06:02:56 +0000
Subject: [PATCH] Bug 29144: Use ->opac_info in opac-library template
Content-Type: text/plain; charset=utf-8

The opac_info call uses find_best_match which does not result in
the All libaries plus specific library response of
AdditionalContents.get.

Test plan:
Revisit individual library page on OPAC.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
index 9986e85a7b..480f09948f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
@@ -3,7 +3,7 @@
 [% USE Koha %]
 [% PROCESS 'display-library-address.inc' %]
 [% USE AdditionalContents %]
-[% SET OpacLibraryInfo = AdditionalContents.get( location => "OpacLibraryInfo",  lang => lang, library => library.branchcode || branchcode, blocktitle => 0 ) %]
+[% IF library %][% SET OpacLibraryInfo = library.opac_info( lang => lang ) %][% END %]
 [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
 [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -37,7 +37,7 @@
 
 [% BLOCK library_description %]
     <div property="description">
-        [% PROCESS koha_news_block news => OpacLibraryInfo %]
+        [% IF OpacLibraryInfo %][% OpacLibraryInfo.content | $raw %][% END %]
     </div>
 [% END %]
 
-- 
2.20.1