From f517974618ba835014e9d2a3565109af469f5d34 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 29 Sep 2011 01:27:24 +0200 Subject: Bug 686786: Decreasing votestoconfirm in editproducts.cgi crashes Bugzilla r/a=mkanat --- Bugzilla/Object.pm | 2 ++ Bugzilla/Product.pm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm index 1cad3e829..29a6415b9 100644 --- a/Bugzilla/Object.pm +++ b/Bugzilla/Object.pm @@ -441,6 +441,8 @@ sub audit_log { # During update, it's the actual %changes hash produced by update(). foreach my $field (keys %$changes) { + # Skip private changes. + next if $field =~ /^_/; my ($from, $to) = @{ $changes->{$field} }; $sth->execute($user_id, $class, $self->id, $field, $from, $to); } diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm index 85524ac47..a0079a033 100644 --- a/Bugzilla/Product.pm +++ b/Bugzilla/Product.pm @@ -223,7 +223,7 @@ sub update { $new_setting->{group}->name, Bugzilla->user->id, $timestamp); } - push(@{$changes->{'group_controls'}->{'now_mandatory'}}, + push(@{$changes->{'_group_controls'}->{'now_mandatory'}}, {name => $new_setting->{group}->name, bug_count => scalar @$bug_ids}); } @@ -248,7 +248,7 @@ sub update { $old_setting->{group}->name, '', Bugzilla->user->id, $timestamp); } - push(@{$changes->{'group_controls'}->{'now_na'}}, + push(@{$changes->{'_group_controls'}->{'now_na'}}, {name => $old_setting->{group}->name, bug_count => scalar @$bug_ids}); } -- cgit v1.2.3-24-g4f1b