Changeset 6008

Timestamp:

04/25/2012 09:25:21 PM (12 years ago)

Author:

djpaul

Message:

Fix new comment activity item not being marked as spam if comment was (i.e. by Akismet). Fixes #4164

File:

• trunk/bp-blogs/bp-blogs-functions.php (modified) (3 diffs)

trunk/bp-blogs/bp-blogs-functions.php

@@ -230 +230 @@
  *
  * @param int $comment_id
- * @param bool $is_approved
+ * @param mixed $is_approved
  * @return mixed
  */
 function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
-
     // Get the users comment
     $recorded_comment = get_comment( $comment_id );
@@ -244 +243 @@
     // Don't record activity if no email address has been included
     if ( empty( $recorded_comment->comment_author_email ) )
+        return false;
+
+    // Don't record activity if the comment has already been marked as spam
+    if ( 'spam' === $is_approved )
         return false;
 
@@ -431 +434 @@
 add_action( 'delete_comment', 'bp_blogs_remove_comment' );
 
-
 /**
  * When a blog comment status transition occurs, update the relevant activity's status.