From 4933de21ea0d5d70d078456ff2317187134f1a4c Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 18 Dec 2017 14:42:25 +0000
Subject: [PATCH] Bug 19677: Properly escape enumchrom/serialseq data

Some serial issues use angle brackets for denoting certain data.
Currently this is not displayed in Koha. This patch escapes the data so
that angle brackets will display.

To test:
1 - Add an enumchron field to an item containg angle brackets:
"This is a <test>"
2 - View the record in the staff and opac, not the field displays as:
"This is a"
3 - Apply patch
4 - Note full text now displays

Signed-off-by: Charlotte Cordwell <charlotte.cordwell123@gmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index be5932bea6..c3d9df303d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -467,12 +467,12 @@
                                     <span class="enum">[% item.enumchron %]</span>
                                     [% IF ( item.serialseq && item.enumchron!=item.serialseq ) %]
                                         <span class="sep"> -- </span>
-                                        <span class="serialseq">[% item.serialseq %]</span>
+                                        <span class="serialseq">[% item.serialseq | html %]</span>
                                     [% END %]
                                 [% ELSIF item.enumchron %]
-                                    <span class="enum">[% item.enumchron %]</span>
+                                    <span class="enum">[% item.enumchron | html %]</span>
                                 [% ELSIF item.serialseq %]
-                                    <span class="serialseq">[% item.serialseq %]</span>
+                                    <span class="serialseq">[% item.serialseq | html %]</span>
                                 [% END %]
                                 [% IF ( item.publisheddate ) %]
                                     <span class="pubdate">([% item.publisheddate | $KohaDates %])</span>
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 ee9d4117e5..270fc08a18 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1306,12 +1306,12 @@
                                 <span class="enum">[% ITEM_RESULT.enumchron %]</span>
                                 [% IF ( ITEM_RESULT.serialseq && ITEM_RESULT.enumchron!=ITEM_RESULT.serialseq ) %]
                                     <span class="sep"> -- </span>
-                                    <span class="serialseq">[% ITEM_RESULT.serialseq %]</span>
+                                    <span class="serialseq">[% ITEM_RESULT.serialseq | html %]</span>
                                 [% END %]
                             [% ELSIF ITEM_RESULT.enumchron %]
-                                <span class="enum">[% ITEM_RESULT.enumchron %]</span>
+                                <span class="enum">[% ITEM_RESULT.enumchron | html %]</span>
                             [% ELSIF ITEM_RESULT.serialseq %]
-                                    <span class="serialseq">[% ITEM_RESULT.serialseq %]</span>
+                                    <span class="serialseq">[% ITEM_RESULT.serialseq | html %]</span>
                             [% END %]
                             [% IF ( ITEM_RESULT.publisheddate ) %]
                                 <span class="pubdate">([% ITEM_RESULT.publisheddate | $KohaDates %])</span>
-- 
2.20.1