Bustage fix for bug 251469. Solve filtering issues with javascript_url,

which includes fixing style_url as well and removing it from
filterexceptions.  r,a=justdave

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 3f9f9ab01731be6d2b33177fe76645ac4424f456..e90037f873be1fbd8c9b89e9612a5fdc453320e1 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -253,7 +253,6 @@
 'global/header.html.tmpl' => [
   'javascript', 
   'style', 
-  'style_url', 
   'bgcolor', 
   'onload',
   'bodyattrs', 

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index b67fdfafaa7f5cc0cc53badc3e2fd2d7014c99e6..511b778e6d56c444f66d144e7d648b5f34ba0c44 100644 (file)
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -74,7 +74,7 @@
     
     [% IF javascript_urls %]
       [% FOREACH javascript_url = javascript_urls %]
-        <script src="[% javascript_url %]" type="text/javascript" language="JavaScript"></script>
+        <script src="[% javascript_url FILTER html %]" type="text/javascript" language="JavaScript"></script>
       [% END %]
     [% END %]
 
@@ -90,7 +90,7 @@
 
     [% IF style_urls %]
       [% FOREACH style_url = style_urls %]
-        <link href="[% style_url %]" rel="stylesheet" type="text/css">
+        <link href="[% style_url FILTER html %]" rel="stylesheet" type="text/css">
       [% END %]
     [% END %]