Bug 978146: activity entry when setting flags isn't split across multiple rows

r=dkl,a=sgreen

1 files changed, 8 insertions, 6 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index d10fbdfd7..cb132f31d 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -4053,11 +4053,12 @@ sub get_activity {
 
 # Update the bugs_activity table to reflect changes made in bugs.
 sub LogActivityEntry {
-    my ($i, $col, $removed, $added, $whoid, $timestamp, $comment_id) = @_;
+    my ($bug_id, $field, $removed, $added, $user_id, $timestamp, $comment_id,
+        $attach_id) = @_;
     my $sth = Bugzilla->dbh->prepare_cached(
-      'INSERT INTO bugs_activity
-       (bug_id, who, bug_when, fieldid, removed, added, comment_id)
-       VALUES (?, ?, ?, ?, ?, ?, ?)');
+        'INSERT INTO bugs_activity
+        (bug_id, who, bug_when, fieldid, removed, added, comment_id, attach_id)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)');
 
     # in the case of CCs, deps, and keywords, there's a possibility that someone
     # might try to add or remove a lot of them at once, which might take more
@@ -4081,8 +4082,9 @@ sub LogActivityEntry {
         }
         trick_taint($addstr);
         trick_taint($removestr);
-        my $fieldid = get_field_id($col);
-        $sth->execute($i, $whoid, $timestamp, $fieldid, $removestr, $addstr, $comment_id);
+        my $fieldid = get_field_id($field);
+        $sth->execute($bug_id, $user_id, $timestamp, $fieldid, $removestr,
+            $addstr, $comment_id, $attach_id);
     }
 }