Bug 120030 - Bugzilla bug lists are a spammer's paradise. Patches by lots of…

Bugzilla/Template.pm

@@ -249,10 +249,10 @@ sub create {
             # Format a time for display (more info in Bugzilla::Util)
             time => \&Bugzilla::Util::format_time,
 
-            # Simple filter to obscure the '@' in user visible strings
+            # Override html filter to obscure the '@' in user visible strings
             # See bug 120030 for details
-            obscure_email => sub {
-                my ($var) = @_;
+            html => sub {
+                my ($var) = Template::Filters::html_filter(@_);
                 $var =~ s/\@/\@/g;
                 return $var;
             },

checksetup.pl

@@ -1078,7 +1078,6 @@ END
                 bug_link => [ sub { return sub { return $_; } }, 1],
                 csv => sub { return $_; },
                 time => sub { return $_; },
-                obscure_email => sub { return $_; },
                 none => sub { return $_; } ,
                },
            }) || die ("Could not create Template Provider: "

t/004template.t

@@ -98,7 +98,6 @@ foreach my $include_path (@include_paths) {
             bug_link => [ sub { return sub { return $_; } }, 1] ,
             csv       => sub { return $_ } ,
             time      => sub { return $_ } ,
-            obscure_email => sub { return $_ } ,
             none      => sub { return $_ } ,
         },
     }