From ef231b41119237952ce8a445c953c3957c987734 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Sep 2018 12:10:47 +0000
Subject: [PATCH] Bug 20658: (follow-up) Fix for QA: Add missing html filters

This patch adds missing filters to the installer header and footer
include files.

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/includes/installer-doc-head-close.inc   |  2 +-
 .../prog/en/includes/installer-intranet-bottom.inc  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
index d634650662..cf4dd76b48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
@@ -2,5 +2,5 @@
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.css" />
 <link rel="stylesheet" type="text/css" href="[% interface | html %]/lib/bootstrap/bootstrap.min.css" />
-<link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme %]/css/installer.css" />
+<link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme | html %]/css/installer.css" />
 <style id="antiClickjack">body{display:none !important;}</style>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
index 7537e410f2..163e736e3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
@@ -1,8 +1,9 @@
-        <script src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
-        <script src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
-        <script src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
-        <script src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
-        <script src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
+[% USE raw %]
+        <script src="[% interface | html %]/lib/jquery/jquery-2.2.3.min.js"></script>
+        <script src="[% interface | html %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
+        <script src="[% interface | html %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
+        <script src="[% interface | html %]/lib/bootstrap/bootstrap.min.js"></script>
+        <script src="[% interface | html %]/lib/jquery/plugins/jquery.validate.min.js"></script>
         <script>
             function _(s) { return s } // dummy function for gettext
             [%# Prevent XFS attacks -%]
@@ -15,6 +16,6 @@
                }
             });
         </script>
-        [% jsinclude # Parse the page template's JavaScript block if necessary %]
+        [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
     </body>
 </html>
-- 
2.39.5