From b346e42e93029197b64c94ec68da600fedb6b508 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <gerv%gerv.net>
Date: Thu, 11 Sep 2003 22:57:19 +0000
Subject: [PATCH] Bug 120030 - Bugzilla bug lists are a spammer's paradise.
 Patches by lots of people, but in the end by gerv; r,a=justdave.

---
 webtools/bugzilla/Bugzilla/Template.pm | 6 +++---
 webtools/bugzilla/checksetup.pl        | 1 -
 webtools/bugzilla/t/004template.t      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/webtools/bugzilla/Bugzilla/Template.pm b/webtools/bugzilla/Bugzilla/Template.pm
index 06be9243cc93..f3e3685f73aa 100644
--- a/webtools/bugzilla/Bugzilla/Template.pm
+++ b/webtools/bugzilla/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/\@/\&#64;/g;
                 return $var;
             },
diff --git a/webtools/bugzilla/checksetup.pl b/webtools/bugzilla/checksetup.pl
index 289f963b035e..2434872cae89 100755
--- a/webtools/bugzilla/checksetup.pl
+++ b/webtools/bugzilla/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/webtools/bugzilla/t/004template.t b/webtools/bugzilla/t/004template.t
index 78d58edd5f0b..136a74f069e0 100644
--- a/webtools/bugzilla/t/004template.t
+++ b/webtools/bugzilla/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 $_ } ,
         },
     }