aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2003-09-12 05:57:06 +0000
committergerv%gerv.net <>2003-09-12 05:57:06 +0000
commit95791d4b9edc26cd55483e71970d9f743f12f094 (patch)
treebe8e3bf0bff09b3be59f4911a9039400b412b4dc
parent26413f0d9594b465cbee93cadd6c0d355f48a81e (diff)
downloadbugs-95791d4b9edc26cd55483e71970d9f743f12f094.tar
bugs-95791d4b9edc26cd55483e71970d9f743f12f094.tar.gz
bugs-95791d4b9edc26cd55483e71970d9f743f12f094.tar.bz2
bugs-95791d4b9edc26cd55483e71970d9f743f12f094.tar.xz
bugs-95791d4b9edc26cd55483e71970d9f743f12f094.zip
Bug 120030 - Bugzilla bug lists are a spammer's paradise. Patches by lots of people, but in the end by gerv; r,a=justdave.
-rw-r--r--Bugzilla/Template.pm6
-rwxr-xr-xchecksetup.pl1
-rw-r--r--t/004template.t1
3 files changed, 3 insertions, 5 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 06be9243c..f3e3685f7 100644
--- 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/\@/\&#64;/g;
return $var;
},
diff --git a/checksetup.pl b/checksetup.pl
index 289f963b0..2434872ca 100755
--- 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 78d58edd5..136a74f06 100644
--- 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 $_ } ,
},
}