From 325ebd2a7da2362b69b82587d01865906ea735ca Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Tue, 9 Oct 2018 12:22:35 +0000
Subject: [PATCH] Bug 21552: Use raw filter for displaying RoutingListNote

The RoutingListNote system preference works like other prefs
allowing you to insert your own content on the routling list
template using HTML. The default text even uses HTML, so it
looks broken without this patch.

To test:
- Add a subscription
- Add a new routing list to it
- Add some patrons to it
- Save
- preview routing list
- Verify that the note shows and is formatted correctly.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f902041e244cc35ecc99e3ca256ff24c843a8b04)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/serials/routing-preview-slip.tt          | 5 +++--
 serials/routing-preview.pl                                   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
index 5739534fba..0c89919014 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials  &rsaquo; Routing slip preview</title>
@@ -30,8 +31,8 @@
 </table>
 
 <div id="routingnotes">
-    <p id="generalroutingnote">[% generalroutingnote %]</p>
-    <p id="routingnote">[% routingnotes %]</p>
+    <p id="generalroutingnote">[% Koha.Preference('RoutingListNote') %]</p>
+    <p id="routingnote">[% routingnotes | html %]</p>
 </div>
 
     <div id="closewindow" class="noprint"><a class="btn btn-default btn-default" id="print_slip" href="#"><i class="fa fa-print"></i> Print</a> <a class="btn btn-default btn-default close" href="#">Close</a></div>
diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 015005c80e..85fc784aff 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -137,7 +137,6 @@ $template->param(
     subscriptionid => $subscriptionid,
     memberloop => $memberloop,
     routingnotes => $routingnotes,
-    generalroutingnote => C4::Context->preference('RoutingListNote'),
     hasRouting => check_routing($subscriptionid),
     (uc(C4::Context->preference("marcflavour"))) => 1
     );
-- 
2.39.5