Bug 13618: Fix escape on sending baskets or shelves by email

Test plan:
Send baskets and shelves by email.
With or without this patch, you should not see any changes.

Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
index c99b54e..c362389 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -22,26 +22,26 @@ Your cart
 [% FILTER html2text %]
 
     [% IF comment %]
-        <p>[% comment %]</p>
+        <p>[% comment.raw %]</p>
         <hr/>
     [% END %]
     <ol>
     [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
         <li>
             <span>
-                [% BIBLIO_RESULT.title %]
-                [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]
+                [% BIBLIO_RESULT.title.raw %]
+                [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %]
             </span>
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %]
+            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
                 [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
                 [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
                     [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
-                        [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %]
+                        [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %]
                     [% END %]
                     [% UNLESS ( loop.last ) %];[% END %]
                 [% END %]
@@ -51,18 +51,18 @@ Your cart
 
             [% IF ( BIBLIO_RESULT.ISBN ) %]
             <span>
-                ISBN: [% BIBLIO_RESULT.ISBN %]
+                ISBN: [% BIBLIO_RESULT.ISBN.raw %]
             </span><br/>
             [% END %]
 
             [% IF BIBLIO_RESULT.publishercode %]
             <span>
-                Published by: [% BIBLIO_RESULT.publishercode %]
+                Published by: [% BIBLIO_RESULT.publishercode.raw %]
                 [% IF ( BIBLIO_RESULT.publicationyear ) %]
-                    in [% BIBLIO_RESULT.publicationyear %]
+                    in [% BIBLIO_RESULT.publicationyear.raw %]
                 [% END %]
                 [% IF ( BIBLIO_RESULT.pages ) %]
-                    , [% BIBLIO_RESULT.pages %]
+                    , [% BIBLIO_RESULT.pages.raw %]
                 [% END %]
                 [% IF BIBLIO_RESULT.item('size') %]
                 , [% BIBLIO_RESULT.item('size') %]
@@ -72,55 +72,55 @@ Your cart
 
             [% IF BIBLIO_RESULT.collection %]
             <span>
-                Collection: [% BIBLIO_RESULT.seriestitle %]
+                Collection: [% BIBLIO_RESULT.seriestitle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.subject ) %]
             <span>
-                Subject: [% BIBLIO_RESULT.subject %]
+                Subject: [% BIBLIO_RESULT.subject.raw %]
             <span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.copyrightdate ) %]
             <span>
-                Copyright year: [% BIBLIO_RESULT.copyrightdate %]
+                Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.notes ) %]
             <span>
-                Notes : [% BIBLIO_RESULT.notes %]
+                Notes : [% BIBLIO_RESULT.notes.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.unititle ) %]
             <span>
-                Unified title: [% BIBLIO_RESULT.unititle %]
+                Unified title: [% BIBLIO_RESULT.unititle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.serial ) %]
             <span>
-                Serial: [% BIBLIO_RESULT.serial %]
+                Serial: [% BIBLIO_RESULT.serial.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.dewey ) %]
             <span>
-                Dewey: [% BIBLIO_RESULT.dewey %]
+                Dewey: [% BIBLIO_RESULT.dewey.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.classification ) %]
             <span>
-                Classification: [% BIBLIO_RESULT.classification %]
+                Classification: [% BIBLIO_RESULT.classification.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.lccn ) %]
             <span>
-                LCCN: [% BIBLIO_RESULT.lccn %]
+                LCCN: [% BIBLIO_RESULT.lccn.raw %]
             </span><br/>
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
@@ -132,17 +132,17 @@ Your cart
 
             [% IF ( OPACBaseURL ) %]
             <p>
-                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
+                In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
             </p>
             [% END %]
             [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
             <p>Items:
             <ul>
                 [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
-                    [% ITEM_RESULT.branchname %]
-                    [% ITEM_RESULT.location %]
-                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
-                    [% ITEM_RESULT.barcode %]
+                    [% ITEM_RESULT.branchname.raw %]
+                    [% ITEM_RESULT.location.raw %]
+                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %]
+                    [% ITEM_RESULT.barcode.raw %]
                 </li>[% END %]
             </ul>
             </p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
index e63d6f5..7f83b8b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt
@@ -1,5 +1,5 @@
 <SUBJECT>
-Your list: [% shelfname %]
+Your list: [% shelfname.raw %]
 <END_SUBJECT>
 
 [% USE HtmlToText %]
@@ -8,7 +8,7 @@ Your list: [% shelfname %]
 [% FILTER html2text %]
     <p>Hi,</p>
 
-    <p>Here is your list called [% shelfname %], sent from our online catalog.</p>
+    <p>Here is your list called [% shelfname.raw %], sent from our online catalog.</p>
 
     <p>Please note that the attached file is a MARC bibliographic records file
     which can be imported into personal bibliographic software like EndNote,
@@ -22,30 +22,30 @@ Your list: [% shelfname %]
 [% FILTER html2text %]
 
     [% IF comment %]
-        <p>[% comment %]</p>
+        <p>[% comment.raw %]</p>
         <hr/>
     [% END %]
     <ol>
     [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
         <li>
             <span>
-                [% BIBLIO_RESULT.title %]
+                [% BIBLIO_RESULT.title.raw %]
                 [% IF ( BIBLIO_RESULT.subtitle.size ) %]
                   [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %]
-                    [% subtitle.subfield %]
+                    [% subtitle.subfield.raw %]
                   [% END %]
                 [% END %]
             </span>
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %]
+            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
                 [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
                 [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
                     [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
-                        [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %]
+                        [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %]
                     [% END %]
                     [% UNLESS ( loop.last ) %];[% END %]
                 [% END %]
@@ -56,7 +56,7 @@ Your list: [% shelfname %]
             [% IF ( BIBLIO_RESULT.ISBN ) %]
             <span>
                 ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %]
-                          [% isbn %]
+                          [% isbn.raw %]
                           [% UNLESS ( loop.last ) %]; [% END %]
                       [% END %]
             </span><br/>
@@ -64,12 +64,12 @@ Your list: [% shelfname %]
 
             [% IF BIBLIO_RESULT.publishercode %]
             <span>
-                Published by: [% BIBLIO_RESULT.publishercode %]
+                Published by: [% BIBLIO_RESULT.publishercode.raw %]
                 [% IF ( BIBLIO_RESULT.publicationyear ) %]
-                    in [% BIBLIO_RESULT.publicationyear %]
+                    in [% BIBLIO_RESULT.publicationyear.raw %]
                 [% END %]
                 [% IF ( BIBLIO_RESULT.pages ) %]
-                    , [% BIBLIO_RESULT.pages %]
+                    , [% BIBLIO_RESULT.pages.raw %]
                 [% END %]
                 [% IF BIBLIO_RESULT.item('size') %]
                 , [% BIBLIO_RESULT.item('size') %]
@@ -79,55 +79,55 @@ Your list: [% shelfname %]
 
             [% IF BIBLIO_RESULT.collection %]
             <span>
-                Collection: [% BIBLIO_RESULT.seriestitle %]
+                Collection: [% BIBLIO_RESULT.seriestitle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.subject ) %]
             <span>
-                Subject: [% BIBLIO_RESULT.subject %]
+                Subject: [% BIBLIO_RESULT.subject.raw %]
             <span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.copyrightdate ) %]
             <span>
-                Copyright year: [% BIBLIO_RESULT.copyrightdate %]
+                Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.notes ) %]
             <span>
-                Notes : [% BIBLIO_RESULT.notes %]
+                Notes : [% BIBLIO_RESULT.notes.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.unititle ) %]
             <span>
-                Unified title: [% BIBLIO_RESULT.unititle %]
+                Unified title: [% BIBLIO_RESULT.unititle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.serial ) %]
             <span>
-                Serial: [% BIBLIO_RESULT.serial %]
+                Serial: [% BIBLIO_RESULT.serial.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.dewey ) %]
             <span>
-                Dewey: [% BIBLIO_RESULT.dewey %]
+                Dewey: [% BIBLIO_RESULT.dewey.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.classification ) %]
             <span>
-                Classification: [% BIBLIO_RESULT.classification %]
+                Classification: [% BIBLIO_RESULT.classification.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.lccn ) %]
             <span>
-                LCCN: [% BIBLIO_RESULT.lccn %]
+                LCCN: [% BIBLIO_RESULT.lccn.raw %]
             </span><br/>
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
@@ -139,17 +139,17 @@ Your list: [% shelfname %]
 
             [% IF ( OPACBaseURL ) %]
             <p>
-                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
+                In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
             </p>
             [% END %]
             [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
             <p>Items:
             <ul>
                 [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
-                    [% ITEM_RESULT.branchname %]
-                    [% ITEM_RESULT.location %]
-                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
-                    [% ITEM_RESULT.barcode %]
+                    [% ITEM_RESULT.branchname.raw %]
+                    [% ITEM_RESULT.location.raw %]
+                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %]
+                    [% ITEM_RESULT.barcode.raw %]
                 </li>[% END %]
             </ul>
             </p>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
index e3c88ab..ec62192 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
@@ -9,7 +9,7 @@ Your cart
 [% FILTER html2text %]
     <p>Hi,</p>
 
-    <p>[% firstname %] [% surname %] sent you a cart from our online catalog.</p>
+    <p>[% firstname.raw %] [% surname.raw %] sent you a cart from our online catalog.</p>
 
     <p>Please note that the attached file is a MARC bibliographic records file
     which can be imported into personal bibliographic software like EndNote,
@@ -22,26 +22,26 @@ Your cart
 [% FILTER html2text %]
 
     [% IF comment %]
-        <p>[% comment %]</p>
+        <p>[% comment.raw %]</p>
         <hr/>
     [% END %]
     <ol>
     [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
         <li>
             <span>
-                [% BIBLIO_RESULT.title %]
-                [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]
+                [% BIBLIO_RESULT.title.raw %]
+                [% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle.raw %][% END %]
             </span>
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %]
+            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
-                [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
+                [% IF ( BIBLIO_RESULT.author.raw ) %]; [% END %]
                 [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
                     [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
-                        [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %]
+                        [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %]
                     [% END %]
                     [% UNLESS ( loop.last ) %];[% END %]
                 [% END %]
@@ -51,76 +51,76 @@ Your cart
 
             [% IF ( BIBLIO_RESULT.ISBN ) %]
             <span>
-                ISBN: [% BIBLIO_RESULT.ISBN %]
+                ISBN: [% BIBLIO_RESULT.ISBN.raw %]
             </span><br/>
             [% END %]
 
             [% IF BIBLIO_RESULT.publishercode %]
             <span>
-                Published by: [% BIBLIO_RESULT.publishercode %]
+                Published by: [% BIBLIO_RESULT.publishercode.raw %]
                 [% IF ( BIBLIO_RESULT.publicationyear ) %]
-                    in [% BIBLIO_RESULT.publicationyear %]
+                    in [% BIBLIO_RESULT.publicationyear.raw %]
                 [% END %]
                 [% IF ( BIBLIO_RESULT.pages ) %]
-                    , [% BIBLIO_RESULT.pages %]
+                    , [% BIBLIO_RESULT.pages.raw %]
                 [% END %]
                 [% IF BIBLIO_RESULT.item('size') %]
-                , [% BIBLIO_RESULT.item('size') %]
+                , [% BIBLIO_RESULT.item('size').raw %]
                 [% END %]
             </span><br/>
             [% END %]
 
             [% IF BIBLIO_RESULT.collection %]
             <span>
-                Collection: [% BIBLIO_RESULT.seriestitle %]
+                Collection: [% BIBLIO_RESULT.seriestitle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.subject ) %]
             <span>
-                Subject: [% BIBLIO_RESULT.subject %]
+                Subject: [% BIBLIO_RESULT.subject.raw %]
             <span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.copyrightdate ) %]
             <span>
-                Copyright year: [% BIBLIO_RESULT.copyrightdate %]
+                Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.notes ) %]
             <span>
-                Notes : [% BIBLIO_RESULT.notes %]
+                Notes : [% BIBLIO_RESULT.notes.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.unititle ) %]
             <span>
-                Unified title: [% BIBLIO_RESULT.unititle %]
+                Unified title: [% BIBLIO_RESULT.unititle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.serial ) %]
             <span>
-                Serial: [% BIBLIO_RESULT.serial %]
+                Serial: [% BIBLIO_RESULT.serial.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.dewey ) %]
             <span>
-                Dewey: [% BIBLIO_RESULT.dewey %]
+                Dewey: [% BIBLIO_RESULT.dewey.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.classification ) %]
             <span>
-                Classification: [% BIBLIO_RESULT.classification %]
+                Classification: [% BIBLIO_RESULT.classification.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.lccn ) %]
             <span>
-                LCCN: [% BIBLIO_RESULT.lccn %]
+                LCCN: [% BIBLIO_RESULT.lccn.raw %]
             </span><br/>
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
@@ -132,17 +132,17 @@ Your cart
 
             [% IF ( OPACBaseURL ) %]
             <p>
-                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
+                In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
             </p>
             [% END %]
             [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
             <p>Items:
             <ul>
                 [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
-                    [% ITEM_RESULT.branchname %]
-                    [% ITEM_RESULT.location %]
-                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
-                    [% ITEM_RESULT.barcode %]
+                    [% ITEM_RESULT.branchname.raw %]
+                    [% ITEM_RESULT.location.raw %]
+                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %]
+                    [% ITEM_RESULT.barcode.raw %]
                 </li>[% END %]
             </ul>
             </p>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
index 4c7f5d4..62a4306 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt
@@ -1,5 +1,5 @@
 <SUBJECT>
-Your list : [% shelfname %]
+Your list : [% shelfname.raw %]
 <END_SUBJECT>
 
 [% USE HtmlToText %]
@@ -8,8 +8,8 @@ Your list : [% shelfname %]
 [% FILTER html2text %]
     <p>Hi,</p>
 
-    <p>[% firstname %] [% surname %] sent you from our online catalog, the
-    virtual shelf called : [% shelfname %].</p>
+    <p>[% firstname.raw %] [% surname.raw %] sent you from our online catalog, the
+    virtual shelf called : [% shelfname.raw %].</p>
 
     <p>Please note that the attached file is a MARC bibliographic records file
     which can be imported into personal bibliographic software like EndNote,
@@ -23,30 +23,30 @@ Your list : [% shelfname %]
 [% FILTER html2text %]
 
     [% IF comment %]
-        <p>[% comment %]</p>
+        <p>[% comment.raw %]</p>
         <hr/>
     [% END %]
     <ol>
     [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
         <li>
             <span>
-                [% BIBLIO_RESULT.title %]
+                [% BIBLIO_RESULT.title.raw %]
                 [% IF ( BIBLIO_RESULT.subtitle.size ) %]
                   [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %]
-                    [% subtitle.subfield %]
+                    [% subtitle.subfield.raw %]
                   [% END %]
                 [% END %]
             </span>
 
             <p>
             [% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
-            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %]
+            <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author.raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
                 [% IF ( BIBLIO_RESULT.author ) %]; [% END %]
                 [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
                     [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
-                        [% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %]
+                        [% MARCAUTHOR_SUBFIELDS_LOO.separator.raw %][% MARCAUTHOR_SUBFIELDS_LOO.value.raw %]
                     [% END %]
                     [% UNLESS ( loop.last ) %];[% END %]
                 [% END %]
@@ -57,7 +57,7 @@ Your list : [% shelfname %]
             [% IF ( BIBLIO_RESULT.ISBN ) %]
             <span>
                 ISBN: [% FOREACH isbn IN BIBLIO_RESULT.ISBN %]
-                          [% isbn %]
+                          [% isbn.raw %]
                           [% UNLESS ( loop.last ) %]; [% END %]
                       [% END %]
             </span><br/>
@@ -65,12 +65,12 @@ Your list : [% shelfname %]
 
             [% IF BIBLIO_RESULT.publishercode %]
             <span>
-                Published by: [% BIBLIO_RESULT.publishercode %]
+                Published by: [% BIBLIO_RESULT.publishercode.raw %]
                 [% IF ( BIBLIO_RESULT.publicationyear ) %]
-                    in [% BIBLIO_RESULT.publicationyear %]
+                    in [% BIBLIO_RESULT.publicationyear.raw %]
                 [% END %]
                 [% IF ( BIBLIO_RESULT.pages ) %]
-                    , [% BIBLIO_RESULT.pages %]
+                    , [% BIBLIO_RESULT.pages.raw %]
                 [% END %]
                 [% IF BIBLIO_RESULT.item('size') %]
                 , [% BIBLIO_RESULT.item('size') %]
@@ -80,55 +80,55 @@ Your list : [% shelfname %]
 
             [% IF BIBLIO_RESULT.collection %]
             <span>
-                Collection: [% BIBLIO_RESULT.seriestitle %]
+                Collection: [% BIBLIO_RESULT.seriestitle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.subject ) %]
             <span>
-                Subject: [% BIBLIO_RESULT.subject %]
+                Subject: [% BIBLIO_RESULT.subject.raw %]
             <span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.copyrightdate ) %]
             <span>
-                Copyright year: [% BIBLIO_RESULT.copyrightdate %]
+                Copyright year: [% BIBLIO_RESULT.copyrightdate.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.notes ) %]
             <span>
-                Notes : [% BIBLIO_RESULT.notes %]
+                Notes : [% BIBLIO_RESULT.notes.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.unititle ) %]
             <span>
-                Unified title: [% BIBLIO_RESULT.unititle %]
+                Unified title: [% BIBLIO_RESULT.unititle.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.serial ) %]
             <span>
-                Serial: [% BIBLIO_RESULT.serial %]
+                Serial: [% BIBLIO_RESULT.serial.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.dewey ) %]
             <span>
-                Dewey: [% BIBLIO_RESULT.dewey %]
+                Dewey: [% BIBLIO_RESULT.dewey.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.classification ) %]
             <span>
-                Classification: [% BIBLIO_RESULT.classification %]
+                Classification: [% BIBLIO_RESULT.classification.raw %]
             </span><br/>
             [% END %]
 
             [% IF ( BIBLIO_RESULT.lccn ) %]
             <span>
-                LCCN: [% BIBLIO_RESULT.lccn %]
+                LCCN: [% BIBLIO_RESULT.lccn.raw %]
             </span><br/>
             [% END %]
             [% IF ( BIBLIO_RESULT.url ) %]
@@ -140,17 +140,17 @@ Your list : [% shelfname %]
 
             [% IF ( OPACBaseURL ) %]
             <p>
-                In online catalog: [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
+                In online catalog: [% OPACBaseURL.raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber %]
             </p>
             [% END %]
             [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
             <p>Items:
             <ul>
                 [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
-                    [% ITEM_RESULT.branchname %]
-                    [% ITEM_RESULT.location %]
-                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
-                    [% ITEM_RESULT.barcode %]
+                    [% ITEM_RESULT.branchname.raw %]
+                    [% ITEM_RESULT.location.raw %]
+                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber.raw %])[% END %]
+                    [% ITEM_RESULT.barcode.raw %]
                 </li>[% END %]
             </ul>
             </p>