From 02adf70507e6ee7a5bd9abc09c811e38230cee11 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Thu, 15 Aug 2019 10:59:46 +0000
Subject: [PATCH] Bug 23409: (follow-up) Allow HTML in circulation note and add
 line breaks in OPAC user account

This patch makes 2 changes:
- bug 22702 allowed adding HTML to the circulation note, so this patch
  restores that ability.
- display OPAC note and messages as multi-line in OPAC

To test:
- Add a circulation and an OPAC note with line breaks and HTML tags
  to the patron account
- Add a message with line breaks to the patron account
- Check line breaks don't show on
  - OPAC > patron account > my summary page
  - Staff > patron account > details
- Apply patches
- Repeat test

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 df2569e424..e309d79c3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -532,7 +532,7 @@
                                         [% IF ( patron.borrowernotes ) %]
                                             <li id="patron-borrowernotes">
                                                 <span class="label">Circulation note: </span><br />
-                                                [% patron.borrowernotes | html | html_line_break %]
+                                                [% patron.borrowernotes | $raw | html_line_break %]
                                             </li>
                                         [% END %]
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
index 39b6cfd97d..2dbf70dac3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc
@@ -4,12 +4,12 @@
         <ul>
             [% FOREACH message IN patron_messages %]
                 <li>
-                    <strong>[% message.message | html %]</strong><br>
+                    <strong>[% message.message | html | html_line_break %]</strong><br>
                     &nbsp;&nbsp;&nbsp;<i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) | html %]</i>
                 </li>
             [% END %]
 
-            [% IF ( opacnote ) %]<li>[% opacnote | html %]</li>[% END %]
+            [% IF ( opacnote ) %]<li>[% opacnote | html | html_line_break %]</li>[% END %]
         </ul>
     </div>
 [% END %]
-- 
2.39.5