Backing out bug 180792. A table is locked as READ while my patch tries to write in...

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 765ad9afad666001b9ba794f2e5df456a5cab1bb..10cbcd0d07842a7585a57ae28bd0993412dd30c1 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -447,9 +447,6 @@ sub update_activity {
                   (bug_id, attach_id, who, bug_when, fieldid, removed, added)
                   VALUES ($bug_id, $attach_id, $::userid, $timestamp,
                   $field_id, $sql_removed, $sql_added)");
-
-        $dbh->do("UPDATE bugs SET delta_ts = $timestamp WHERE bug_id = ?",
-                 undef, $bug_id);
     }
 }
 

diff --git a/attachment.cgi b/attachment.cgi
index 0ed608c521d74cc3834769d307c12aa3e3c0b12d..8b9bdaafd58984fc1d613c30612b7114a7ad455d 100755 (executable)
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -1251,7 +1251,7 @@ sub update
 
   # If the user submitted a comment while editing the attachment,
   # add the comment to the bug.
-  if ($cgi->param('comment'))
+  if (defined $cgi->param('comment'))
   {
     # Prepend a string to the comment to let users know that the comment came
     # from the "edit attachment" screen.