From: Hugo Seabrook <hugo.seabrook@yahoo.com>
Date: Wed, 5 Jun 2013 18:13:49 +0000 (+0200)
Subject: Bug 875744: Bug history messed up when two comments are made private
X-Git-Tag: bugzilla-4.4.1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7cbf4a7ab7a97b81a4367666452497452b7fefb;p=thirdparty%2Fbugzilla.git

Bug 875744: Bug history messed up when two comments are made private
r/a=LpSolit
---

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 4d1181315f..768015f880 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3895,6 +3895,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;
@@ -3909,7 +3910,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);