From ed227115b6818a9e6c5848cc2dfe5bda463a740f Mon Sep 17 00:00:00 2001 From: Hugo Seabrook Date: Wed, 5 Jun 2013 20:12:30 +0200 Subject: Bug 875744: Bug history messed up when two comments are made private r/a=LpSolit --- Bugzilla/Bug.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 576ce9d52..985978cb6 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -3944,6 +3944,7 @@ sub get_activity { 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; @@ -3958,7 +3959,7 @@ sub get_activity { $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); -- cgit v1.2.3-24-g4f1b