Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.89
diff -u -p -r1.89 mollom.module
--- mollom.module	9 Oct 2010 23:13:01 -0000	1.89
+++ mollom.module	17 Oct 2010 19:58:37 -0000
@@ -2049,6 +2049,26 @@ function mollom_mail_add_report_link(&$m
 }
 
 /**
+ * Implements hook_entity_update().
+ */
+function mollom_entity_update($entity, $type) {
+  // If an existing entity is published and we have session data stored for it,
+  // mark the data as moderated.
+  if (!empty($entity->status)) {
+    $id = reset(entity_extract_ids($type, $entity));
+    mollom_data_moderate($type, $id);
+  }
+}
+
+/**
+ * Implements hook_entity_delete().
+ */
+function mollom_entity_delete($entity, $type) {
+  $id = reset(entity_extract_ids($type, $entity));
+  mollom_data_delete($type, $id);
+}
+
+/**
  * @name mollom_node Node module integration for Mollom.
  * @{
  */
@@ -2115,24 +2135,6 @@ function node_mollom_form_moderation(&$f
 }
 
 /**
- * Implements hook_node_presave().
- */
-function mollom_node_presave($comment) {
-  // If an existing node is published and we have session data stored for it,
-  // mark the data as moderated.
-  if (!empty($node->nid) && $node->status) {
-    mollom_data_moderate('node', $node->nid);
-  }
-}
-
-/**
- * Implements hook_node_delete().
- */
-function mollom_node_delete($node) {
-  mollom_data_delete('node', $node->nid);
-}
-
-/**
  * Implements hook_form_FORMID_alter().
  */
 function mollom_form_node_multiple_delete_confirm_alter(&$form, &$form_state) {
@@ -2214,24 +2216,6 @@ function comment_mollom_form_moderation(
 }
 
 /**
- * Implements hook_comment_presave().
- */
-function mollom_comment_presave($comment) {
-  // If an existing comment is published and we have session data stored for it,
-  // mark the data as moderated.
-  if (!empty($comment->cid) && $comment->status == COMMENT_PUBLISHED) {
-    mollom_data_moderate('comment', $comment->cid);
-  }
-}
-
-/**
- * Implements hook_comment_delete().
- */
-function mollom_comment_delete($comment) {
-  mollom_data_delete('comment', $comment->cid);
-}
-
-/**
  * Implements hook_form_FORMID_alter().
  */
 function mollom_form_comment_multiple_delete_confirm_alter(&$form, &$form_state) {