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

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 06be9243cc93b477970db6b72f462ae147c4a958..f3e3685f73aaed2e5206695f3067ae91eb37e20a 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/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;
             },

diff --git a/checksetup.pl b/checksetup.pl
index 289f963b035e64f98fedee9d435a568c2b96160c..2434872cae89f93831a8234dffc948cd31bffcab 100755 (executable)
--- a/checksetup.pl
+++ b/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: "

diff --git a/t/004template.t b/t/004template.t
index 78d58edd5f0bf8797a1209ef662506e14dcefba9..136a74f069e062f7a18423e5862c9be5fb92a013 100644 (file)
--- a/t/004template.t
+++ b/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 $_ } ,
         },
     }