summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-05-06 08:31:38 +0200
committerByron Jones <bjones@mozilla.com>2013-05-06 08:31:38 +0200
commit3cf96e72e7485278bf3d51719e935b73af04fdf4 (patch)
tree74fa7fb4516c1adfe567b198c5d5944517a78bdf /Bugzilla
parente99876edf0c74a0924856ba7e7f988457b18478b (diff)
downloadbugzilla-3cf96e72e7485278bf3d51719e935b73af04fdf4.tar.gz
bugzilla-3cf96e72e7485278bf3d51719e935b73af04fdf4.tar.xz
Bug 825886: When moving bugs from one product to another, I should be able to keep a security bug private across groups that I'm not a member of
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Bug.pm17
1 files changed, 3 insertions, 14 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 383a865ef..613aefdc9 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1699,14 +1699,6 @@ sub _check_groups {
: $params->{product};
my %add_groups;
- # BMO: Allow extension to add groups before the
- # real checks are done.
- Bugzilla::Hook::process('bug_check_groups', {
- product => $product,
- group_names => $group_names,
- add_groups => \%add_groups
- });
-
# In email or WebServices, when the "groups" item actually
# isn't specified, then just add the default groups.
if (!defined $group_names) {
@@ -1725,12 +1717,9 @@ sub _check_groups {
foreach my $name (@$group_names) {
my $group = Bugzilla::Group->check_no_disclose({ %args, name => $name });
- # BMO: Do not check group_is_settable if the group is
- # already added, such as from the extension hook. group_is_settable
- # will reject any group the user is not currently in.
- if (!$add_groups{$group->id}
- && !$product->group_is_settable($group))
- {
+ # BMO : allow bugs to be always placed into some groups
+ if (!$product->group_always_settable($group)
+ && !$product->group_is_settable($group)) {
ThrowUserError('group_restriction_not_allowed', { %args, name => $name });
}
$add_groups{$group->id} = $group;