diff options
| author | Hugo Seabrook <hugo.seabrook@yahoo.com> | 2013-06-10 19:45:59 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-06-10 19:45:59 +0200 |
| commit | f996e4ab39111e463e5deaf5fa14a9a01d893632 (patch) | |
| tree | b39c6c9c2078f802b8e07ef59b906a11fb880ff7 /Bugzilla/Bug.pm | |
| parent | 4f275264d76e2a164462dafd26d2defbbab1bef7 (diff) | |
| download | bugzilla-f996e4ab39111e463e5deaf5fa14a9a01d893632.tar.gz bugzilla-f996e4ab39111e463e5deaf5fa14a9a01d893632.tar.xz | |
Bug 875744: Bug history messed up when two comments are made private
Diffstat (limited to 'Bugzilla/Bug.pm')
| -rw-r--r-- | Bugzilla/Bug.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 613aefdc9..75d388faa 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -3906,6 +3906,7 @@ sub GetBugActivity { if ($operation->{'who'} && $who eq $operation->{'who'} && $when eq $operation->{'when'} && $fieldname eq $operation->{'fieldname'} + && ($comment_id || 0) == ($operation->{'comment_id'} || 0) && ($attachid || 0) == ($operation->{'attachid'} || 0)) { my $old_change = pop @$changes; @@ -3922,7 +3923,7 @@ sub GetBugActivity { $change{'added'} = $added; if ($comment_id) { - $change{'comment'} = Bugzilla::Comment->new($comment_id); + $operation->{comment_id} = $change{'comment'} = Bugzilla::Comment->new($comment_id); } push (@$changes, \%change); |