From f996e4ab39111e463e5deaf5fa14a9a01d893632 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@yahoo.com>
Date: Tue, 11 Jun 2013 01:45:59 +0800
Subject: Bug 875744: Bug history messed up when two comments are made private

---
 Bugzilla/Bug.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3-24-g4f1b