From 8d61035e8574a89d5dae44a0c4120e657539c3dc Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 13 Aug 2018 14:31:52 -0300
Subject: [PATCH] Bug 13618: (follow-up) Add html filters to all the variables

IntranetUserJS was missing (?!)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc      | 2 +-
 .../intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
index beffefd58f..046c7d525d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
@@ -29,7 +29,7 @@
 [% IF ( IntranetUserJS ) %]
     <script type="text/javascript">
     //<![CDATA[
-    [% IntranetUserJS | html %]
+    [% IntranetUserJS | $raw %]
     //]]>
     </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
index 76758bd73c..6ced131c2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
@@ -12,7 +12,7 @@
         .noprint { display: none; }
     }
 </style>
-[% IF ( IntranetUserCSS ) %]<style>[% IntranetUserCSS | html %]</style>[% END %]
+[% IF ( IntranetUserCSS ) %]<style>[% IntranetUserCSS | $raw %]</style>[% END %]
 </head>
 
 	[% IF ( BarcodeNotFound ) %]
@@ -37,7 +37,7 @@
     [% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %]
     [% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %]
     <script>
-        [% IntranetUserJS | html %]
+        [% IntranetUserJS | $raw %]
     </script>
 [% END %]
 
-- 
2.20.1