aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2008-12-10 18:26:51 +0000
committerlpsolit%gmail.com <>2008-12-10 18:26:51 +0000
commite087aa6018bab95f403c836d12b30bb5ed39a626 (patch)
tree854a5c41e66b01678bf355c4d9a04232c1136e22 /Bugzilla
parent65792b68dc19ad0be43473ca0ff6860e06b40421 (diff)
downloadbugs-e087aa6018bab95f403c836d12b30bb5ed39a626.tar
bugs-e087aa6018bab95f403c836d12b30bb5ed39a626.tar.gz
bugs-e087aa6018bab95f403c836d12b30bb5ed39a626.tar.bz2
bugs-e087aa6018bab95f403c836d12b30bb5ed39a626.tar.xz
bugs-e087aa6018bab95f403c836d12b30bb5ed39a626.zip
Bug 399072: Remove the 'supportwatchers' parameter - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/BugMail.pm30
-rw-r--r--Bugzilla/Config/Admin.pm8
2 files changed, 15 insertions, 23 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 4e91d4be4..9a5e1a4c9 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -410,23 +410,21 @@ sub Send {
}
}
- if (Bugzilla->params->{"supportwatchers"}) {
- # Find all those user-watching anyone on the current list, who is not
- # on it already themselves.
- my $involved = join(",", keys %recipients);
-
- my $userwatchers =
- $dbh->selectall_arrayref("SELECT watcher, watched FROM watch
- WHERE watched IN ($involved)");
-
- # Mark these people as having the role of the person they are watching
- foreach my $watch (@$userwatchers) {
- while (my ($role, $bits) = each %{$recipients{$watch->[1]}}) {
- $recipients{$watch->[0]}->{$role} |= BIT_WATCHING
- if $bits & BIT_DIRECT;
- }
- push (@{$watching{$watch->[0]}}, $watch->[1]);
+ # Find all those user-watching anyone on the current list, who is not
+ # on it already themselves.
+ my $involved = join(",", keys %recipients);
+
+ my $userwatchers =
+ $dbh->selectall_arrayref("SELECT watcher, watched FROM watch
+ WHERE watched IN ($involved)");
+
+ # Mark these people as having the role of the person they are watching
+ foreach my $watch (@$userwatchers) {
+ while (my ($role, $bits) = each %{$recipients{$watch->[1]}}) {
+ $recipients{$watch->[0]}->{$role} |= BIT_WATCHING
+ if $bits & BIT_DIRECT;
}
+ push(@{$watching{$watch->[0]}}, $watch->[1]);
}
# Global watcher
diff --git a/Bugzilla/Config/Admin.pm b/Bugzilla/Config/Admin.pm
index 838e53295..18818e6b5 100644
--- a/Bugzilla/Config/Admin.pm
+++ b/Bugzilla/Config/Admin.pm
@@ -56,13 +56,7 @@ sub get_param_list {
name => 'allowuserdeletion',
type => 'b',
default => 0
- },
-
- {
- name => 'supportwatchers',
- type => 'b',
- default => 0
- } );
+ });
return @param_list;
}