summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorHugo Seabrook <hugo.seabrook@yahoo.com>2013-06-05 20:12:30 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2013-06-05 20:12:30 +0200
commited227115b6818a9e6c5848cc2dfe5bda463a740f (patch)
treec7a9530eb8adf765024a2926e2a13553a332aeda /Bugzilla
parente4aa1e72aed102d06d13bfe95a96df4c15ecd068 (diff)
downloadbugzilla-ed227115b6818a9e6c5848cc2dfe5bda463a740f.tar.gz
bugzilla-ed227115b6818a9e6c5848cc2dfe5bda463a740f.tar.xz
Bug 875744: Bug history messed up when two comments are made private
r/a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Bug.pm3
1 files changed, 2 insertions, 1 deletions
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);