summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReed Loden <reed@reedloden.com>2012-06-19 19:38:43 +0200
committerReed Loden <reed@reedloden.com>2012-06-19 19:38:43 +0200
commit6e6a0777b8eedfc79da2d7a156e06076e3c84be8 (patch)
tree85463eafafac058c0264940626e721a630c6fef3
parent270d4ce7fc25af173f36c4246310e1305975cb1f (diff)
downloadbugzilla-6e6a0777b8eedfc79da2d7a156e06076e3c84be8.tar.gz
bugzilla-6e6a0777b8eedfc79da2d7a156e06076e3c84be8.tar.xz
Bug 765423 - Update security group to mailing list mappings
[r=glob]
-rw-r--r--extensions/BMO/Extension.pm10
-rw-r--r--extensions/BMO/lib/Data.pm15
2 files changed, 14 insertions, 11 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 658fa67a0..410731936 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -237,7 +237,7 @@ sub cf_hidden_in_product {
: $product_name;
# Also in buglist.cgi, we pass in a list of components instead
- # of a single compoent name everywhere else.
+ # of a single component name everywhere else.
my $component_list = [];
if ($component_name) {
$component_list = ref $component_name ? $component_name
@@ -342,9 +342,11 @@ sub _cc_if_special_group {
return if !$group;
- if ($group_to_cc_map{$group}) {
- my $id = login_to_id($group_to_cc_map{$group});
- $recipients->{$id}->{+REL_CC} = Bugzilla::BugMail::BIT_DIRECT();
+ if (exists $group_to_cc_map{$group}) {
+ foreach my $login (@{ $group_to_cc_map{$group} }) {
+ my $id = login_to_id($login);
+ $recipients->{$id}->{+REL_CC} = Bugzilla::BugMail::BIT_DIRECT();
+ }
}
}
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index b5840bca4..1e3f95e08 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -249,13 +249,14 @@ our $cf_disabled_flags = [
# Who to CC on particular bugmails when certain groups are added or removed.
our %group_to_cc_map = (
- 'addons-security' => 'amo-editors@mozilla.org',
- 'bugzilla-security' => 'security@bugzilla.org',
- 'client-services-security' => 'amo-admins@mozilla.org',
- 'core-security' => 'security@mozilla.org',
- 'tamarin-security' => 'tamarinsecurity@adobe.com',
- 'websites-security' => 'website-drivers@mozilla.org',
- 'webtools-security' => 'webtools-security@mozilla.org',
+ 'addons-security' => ['amo-editors@mozilla.org'],
+ 'bugzilla-security' => ['security@bugzilla.org'],
+ 'client-services-security' => ['amo-admins@mozilla.org', 'web-security@mozilla.org'],
+ 'core-security' => ['security@mozilla.org'],
+ 'mozilla-services-security' => ['web-security@mozilla.org'],
+ 'tamarin-security' => ['tamarinsecurity@adobe.com'],
+ 'websites-security' => ['web-security@mozilla.org'],
+ 'webtools-security' => ['web-security@mozilla.org'],
);
# Only users in certain groups can change certain custom fields in