Bug 21352: Use the raw filter for plugin hooks, both opac and staff side

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 0cd6b7e..84d32eb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -25,7 +25,7 @@
 [% END %]
 [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS | $raw %]</style>[% END %]
 
-[% KohaPlugins.get_plugins_intranet_head | html %]
+[% KohaPlugins.get_plugins_intranet_head | $raw %]
 
 [% UNLESS ( footerjs ) %]
     [% INCLUDE js_includes.inc %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index cfbf362..d7d75bb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -72,5 +72,5 @@
         [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
     [% END %]
     </body>
-[% KohaPlugins.get_plugins_intranet_js | html %]
+[% KohaPlugins.get_plugins_intranet_js | $raw %]
 </html>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
index 480b5a5..22160e9 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -56,4 +56,4 @@
 [% Asset.js("lib/modernizr.min.js") | $raw %]
 [% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
 [% PROCESS 'html_helpers.inc' %]
-[% KohaPlugins.get_plugins_opac_head | html %]
+[% KohaPlugins.get_plugins_opac_head | $raw %]