From 06e4a50f00efc62bbeb54260350f6f402d2e5e98 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 18 Jan 2016 11:18:11 +0000
Subject: [PATCH] Bug 13618: Specific for branches.opac_info

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 71c3c952ef..36c4f2b9e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -189,7 +189,7 @@ tinyMCE.init({
                 <li><label for="branchreplyto">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email"  size="80" value="[% library.branchreplyto %]" /></li>
                 <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email"  size="80" value="[% library.branchreturnpath %]" /></li>
                 <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% library.branchurl %]" class="url" /></li>
-                <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info %]</textarea></li>
+                <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info.raw %]</textarea></li>
                 <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% library.branchip %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
                 <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes %]" /></li>
             </ol>
@@ -259,7 +259,7 @@ tinyMCE.init({
                             [% IF library.branchurl %]
                                 <br /><a href="[% library.branchurl %]">[% library.branchurl %]</a>[% END %]
                             [% IF library.opac_info %]
-                                <br />OPAC Info: <div>[% library.opac_info %]</div>[% END %]
+                                <br />OPAC Info: <div>[% library.opac_info.raw %]</div>[% END %]
                             [% IF library.branchnotes %]
                                 <br />Notes: [% library.branchnotes %][% END %]
                         </td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 82827c5c59..b9ab8cbb54 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1213,7 +1213,7 @@
                                         <span>[% ITEM_RESULT.branchname %]</span>
                                     [% END %]
                                 </span>
-                                <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info %]</div>
+                                <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info.raw %]</div>
 
                                 [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %]
                                     <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
@@ -1238,7 +1238,7 @@
                                         <span>[% Branches.GetName( ITEM_RESULT.homebranch ) %]</span>
                                     [% END %]
                                 </span>
-                                <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info %]</div>
+                                <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info.raw %]</div>
 
                                 [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %]
                                     <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
-- 
2.39.5