From 2bf66d987a9511bd5da108cf27a9cfe2f47e3634 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Fri, 12 Apr 2019 23:04:06 +0000
Subject: [PATCH] Bug 22702: circulation note on patron page should allow for
 HTML tags
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9f34d208d08fc89d2d0b4d3718fc43e3f32ff055)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index bc7f206133..0a68087a56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -765,7 +765,7 @@ No patron matched <span class="ex">[% message | html %]</span>
 	[% IF ( notes ) %]
 			<div id="circnotes" class="circmessage">
 			<h4>Notes:</h4>
-            <p><span class="circ-hlt">[% notesmsg | html %]</span></p>
+            <p><span class="circ-hlt">[% notesmsg | $raw %]</span></p>
 			</div>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index a98cbcd8e0..9e72106143 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -483,7 +483,7 @@
                                         [% IF ( patron.borrowernotes ) %]
                                             <li id="patron-borrowernotes">
                                                 <span class="label">Circulation note: </span>
-                                                [% patron.borrowernotes | html %]
+                                                [% patron.borrowernotes | $raw %]
                                             </li>
                                         [% END %]
 
-- 
2.39.5