Bug 238797: minor adjustment to javascript filters to prevent tags inserted in produc...

r=gerv, a=justdave

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index cb6b54c906643024f13107621327577168e64850..cddd33ba47ffd6d5dac71dbc6cf76ef3ded9d150 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -229,7 +229,7 @@ sub create {
             # and newlines/carriage returns escaped for use in JS strings.
             js => sub {
                 my ($var) = @_;
-                $var =~ s/([\\\'\"])/\\$1/g;
+                $var =~ s/([\\\'\"\/])/\\$1/g;
                 $var =~ s/\n/\\n/g;
                 $var =~ s/\r/\\r/g;
                 $var =~ s/\@/\\x40/g; # anti-spam for email addresses

diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl
index 0185df0c79f82b1d5698051949429b44976aeefa..44cbf36c29ab5bccba75e1fc4d5cc35fb89d051c 100644 (file)
--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -98,7 +98,7 @@
         <td>
           <a href="editflagtypes.cgi?action=copy&amp;id=[% type.id %]">Copy</a>
           | <a href="editflagtypes.cgi?action=confirmdelete&amp;id=[% type.id %]"
-               onclick="return confirmDelete([% type.id %], '[% type.name FILTER js %]',
+               onclick="return confirmDelete([% type.id %], '[% type.name FILTER js FILTER html %]',
                                              [% type.flag_count %]);">Delete</a>
         </td>
       </tr>

diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index f0194155d89f25b19cc02b154a25fa0ad4eb1e5c..b93f8099dba08e717cebecc7960d64f1ffbd6e3b 100644 (file)
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -97,7 +97,7 @@
         [% terms.bug %] to
       </label>
       <input name="assigned_to" size="32"
-             onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
+             onchange="if ((this.value != '[% bug.assigned_to.email FILTER js FILTER html %]') &&
                             (this.value != '')) {
                          document.changeform.knob[[% knum %]].checked=true;
                        }"