Changeset 1979

Timestamp:

09/28/2009 08:48:50 PM (15 years ago)

Author:

apeatling

Message:

Comment recording tweaks and fixes, fixes #1074

File:

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

trunk/bp-blogs.php

@@ -475 +475 @@
 add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
 
-function bp_blogs_approve_comment( $comment_id, $comment ) {
+function bp_blogs_approve_comment( $comment_id, $comment_status ) {
     global $bp, $wpdb;
+    
+    if ( 'approve' != $comment_status )
+        return false;
 
     $recorded_comment = bp_blogs_record_comment( $comment_id, true );
@@ -484 +487 @@
     bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 
-    $comment_link = bp_post_get_permalink( $comment->post, $comment->blog_id );
-    $content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );            
-    $content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
+    $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
+    $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );           
+    $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
 
     /* Record this in activity streams */
@@ -499 +502 @@
     ) );
 }
-add_action( 'comment_approved_', 'bp_blogs_approve_comment', 10, 2 );
-
-function bp_blogs_unapprove_comment( $comment_id, $status = false ) {
-    if ( 'spam' == $status || !$status )
+add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );
+
+function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
+    if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
         bp_blogs_remove_comment( $comment_id );     
 }
-add_action( 'comment_unapproved_', 'bp_blogs_unapprove_comment' );
 add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );