Bug 219216: Javascript improperly using FILTER html instead of FILTER js causing...

r=timeless, a=justdave

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index f3e3685f73aaed2e5206695f3067ae91eb37e20a..f9342e11f599f3deccffa82362fa17cfb0e50f07 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -194,6 +194,7 @@ sub create {
                 $var =~ s/([\\\'\"])/\\$1/g;
                 $var =~ s/\n/\\n/g;
                 $var =~ s/\r/\\r/g;
+                $var =~ s/\@/\\x40/g; # anti-spam for email addresses
                 return $var;
             },
 

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index b15efffac122c8f4feb781f13262afc858baf4d3..507324bf7affe20b4eec1bc5bd885f2ea57fc00c 100644 (file)
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -33,8 +33,8 @@ var default_owners = new Array([% component_.size %]);
 var components = new Array([% component_.size %]);
 [% count = 0 %]
 [%- FOREACH c = component_ %]
-    components[[% count %]] = "[% c.name FILTER html %]";
-    default_owners[[% count %]] = "[% c.default_login FILTER html %]";
+    components[[% count %]] = "[% c.name FILTER js %]";
+    default_owners[[% count %]] = "[% c.default_login FILTER js %]";
     [% count = count + 1 %]
 [%- END %]
 var last_default_owner;