From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Tue, 4 Jun 2019 18:42:59 +0000 (-0400)
Subject: Bug 1556320 - Mismatch between changed summary and current summary
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4150fed3609ae02a8663a513243896f77b02181d;p=thirdparty%2Fbugzilla.git

Bug 1556320 - Mismatch between changed summary and current summary
---

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 88cf7a307..7c486fe1d 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -4535,7 +4535,6 @@ sub GetBugActivity {
     INNER JOIN profiles
             ON profiles.userid = bugs_activity.who
          WHERE bugs_activity.bug_id = ?
-           AND bugs_activity.removed != bugs_activity.added
                $datepart
                $attachpart
                $suppwhere ";
@@ -4591,12 +4590,13 @@ sub GetBugActivity {
     my $activity_visible = 1;
     my $last_change = @$changes[-1] || {};
 
-    # Suppress any mid-air collision
-    if ( $when eq $operation->{'when'}
+    # Suppress any mid-air collision or duplicated change
+    if (( $when eq $operation->{'when'}
       && $fieldname eq $last_change->{'fieldname'}
       && $removed eq $last_change->{'removed'}
       && $added eq $last_change->{'added'}
       && $attachid eq $last_change->{'attachid'})
+      || $removed eq $added )
     {
       next;
     }