summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-03-23 04:21:22 +0100
committerByron Jones <glob@mozilla.com>2015-03-23 04:21:22 +0100
commit9d045e4d060bc531e4243c621d07c79699fd22c8 (patch)
tree34eb2e01a26e4fa7ba73144a329496a13e33466b /extensions
parentcf1539d9223bd4ebc2c64cdc25624603aa7441ea (diff)
downloadbugzilla-9d045e4d060bc531e4243c621d07c79699fd22c8.tar.gz
bugzilla-9d045e4d060bc531e4243c621d07c79699fd22c8.tar.xz
Bug 1146219: the 'abuse' comment tag should function like the 'abusive' tag and trigger automatic account disabling
Diffstat (limited to 'extensions')
-rw-r--r--extensions/AntiSpam/Extension.pm2
-rw-r--r--extensions/AntiSpam/template/en/default/admin/params/antispam.html.tmpl6
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/AntiSpam/Extension.pm b/extensions/AntiSpam/Extension.pm
index 7a0f27b31..5ddc4c833 100644
--- a/extensions/AntiSpam/Extension.pm
+++ b/extensions/AntiSpam/Extension.pm
@@ -132,7 +132,7 @@ sub _ip_blocking {
sub comment_after_add_tag {
my ($self, $args) = @_;
my $tag = lc($args->{tag});
- return unless $tag eq 'spam' or $tag eq 'abusive';
+ return unless $tag eq 'spam' or $tag eq 'abusive' or $tag eq 'abuse';
my $comment = $args->{comment};
my $author = $comment->author;
diff --git a/extensions/AntiSpam/template/en/default/admin/params/antispam.html.tmpl b/extensions/AntiSpam/template/en/default/admin/params/antispam.html.tmpl
index 76299f546..671ac40f4 100644
--- a/extensions/AntiSpam/template/en/default/admin/params/antispam.html.tmpl
+++ b/extensions/AntiSpam/template/en/default/admin/params/antispam.html.tmpl
@@ -18,7 +18,7 @@
antispam_spammer_comment_count =>
"If a user has made at least this many comments, and either their first " _
- "NNN comments or their last NNN comments have been tagged as spam, their " _
+ "NNN comments or their last NNN comments have been tagged as 'spam', their " _
"account will be automatically disabled."
antispam_spammer_disable_text =>
@@ -27,8 +27,8 @@
antispam_abusive_comment_count =>
"If a user has made at least this many comments, and either their first " _
- "NNN comments or their last NNN comments have been tagged as abusive, their " _
- "account will be automatically disabled."
+ "NNN comments or their last NNN comments have been tagged as 'abusive' or " _
+ "'abuse', their account will be automatically disabled."
antispam_abusive_disable_text =>
"This message will be displayed to the user when they try to log " _