? 289726_nothing_to_blocked_users_whitespace.patch
? 290781_comment_notify_cleanup.patch
? 296549_5x_comment_notify_anon_leave_mail.patch
? 297791_5x_comment_notify_handle_deletion.patch
? comment_notify_cleanup.patch
Index: comment_notify.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/comment_notify/comment_notify.install,v
retrieving revision 1.4
diff -u -p -r1.4 comment_notify.install
--- comment_notify.install	29 Jul 2008 20:41:21 -0000	1.4
+++ comment_notify.install	20 Aug 2008 21:45:51 -0000
@@ -130,4 +130,13 @@ function comment_notify_update_5() {
   return $ret;
 
   // TODO alter the comments table to remove my column?
+}
+
+
+/**
+ * Sync up the two tables after as part of http://drupal.org/node/297791
+ */
+function comment_notify_update_5000() {
+  $return[] = update_sql("DELETE FROM {comment_notify} WHERE cid NOT IN (SELECT cid FROM {comments})");
+  return $return;
 }
\ No newline at end of file
Index: comment_notify.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/comment_notify/comment_notify.module,v
retrieving revision 1.8.2.1
diff -u -p -r1.8.2.1 comment_notify.module
--- comment_notify.module	4 Aug 2008 19:30:45 -0000	1.8.2.1
+++ comment_notify.module	20 Aug 2008 21:45:51 -0000
@@ -235,6 +235,9 @@ function comment_notify_comment($comment
       // And then save the data.
       db_query("INSERT INTO {comment_notify} (cid, notify, notify_hash) values (%d, %d, '%s')", $comment['cid'], $comment['notify'], md5($md5_string));
       break;
+    case 'delete':
+      db_query("DELETE FROM {comment_notify} WHERE cid = %d", $comment->cid);
+      break;
   }
 }