summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Bug.pm
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-05-20 07:16:59 +0200
committerByron Jones <glob@mozilla.com>2014-05-20 07:16:59 +0200
commit5929fb98320aa73bbd0b01bbe85a3984e5194a87 (patch)
tree52f67e923a9650535a3c66b0229784fce15ab716 /Bugzilla/Bug.pm
parent9365f5f3c2720e0eaa0fb7ee40a0c5b201287843 (diff)
downloadbugzilla-5929fb98320aa73bbd0b01bbe85a3984e5194a87.tar.gz
bugzilla-5929fb98320aa73bbd0b01bbe85a3984e5194a87.tar.xz
Bug 504461: Allow everyone to make bugs security-sensitive retroactively
Diffstat (limited to 'Bugzilla/Bug.pm')
-rw-r--r--Bugzilla/Bug.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index c5125e18b..344939333 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -2915,11 +2915,11 @@ sub add_group {
# If the bug is already in this group, then there is nothing to do.
return if $self->in_group($group);
-
# BMO : allow bugs to be always placed into some groups by the bug's
- # reporter
- if ($self->{reporter_id} != Bugzilla->user->id
- || !$self->product_obj->group_always_settable($group))
+ # reporter, or by users with editbugs
+ my $user = Bugzilla->user;
+ if (!$self->product_obj->group_always_settable($group)
+ || ($self->{reporter_id} != $user->id && !$user->in_group('editbugs')))
{
# Make sure that bugs in this product can actually be restricted
# to this group by the current user.
@@ -2928,7 +2928,7 @@ sub add_group {
# OtherControl people can add groups only during a product change,
# and only when the group is not NA for them.
- if (!Bugzilla->user->in_group($group->name)) {
+ if (!$user->in_group($group->name)) {
my $controls = $self->product_obj->group_controls->{$group->id};
if (!$self->{_old_product_name}
|| $controls->{othercontrol} == CONTROLMAPNA)