Changeset 4959

Timestamp:

08/09/2011 08:11:13 PM (14 years ago)

Author:

djpaul

Message:

When recording activity items for comments, check that the post object is a standard WordPress Post. Fixes #3455, props sbrajesh for initial patch

File:

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

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

@@ -206 +206 @@
  * password protected.
  *
- * @global object $wpdb
  * @global $bp $bp
  * @param int $comment_id
@@ -213 +212 @@
  */
 function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
-    global $wpdb, $bp;
+    global $bp;
 
     // Get the users comment
@@ -235 +234 @@
 
     // Get blog and post data
-    $blog_id                = (int)$wpdb->blogid;
+    $blog_id                = get_current_blog_id();
     $recorded_comment->post = get_post( $recorded_comment->comment_post_ID );
+
+    if ( empty( $recorded_comment->post ) || is_wp_error( $recorded_comment->post ) )
+        return false;
 
     // If this is a password protected post, don't record the comment
     if ( !empty( $recorded_comment->post->post_password ) )
+        return false;
+
+    // Don't record activity if the comment's associated post isn't a WordPress Post
+    if ( 'post' != $recorded_comment->post->post_type )
         return false;