Changeset 10277

Timestamp:

10/14/2015 04:37:30 PM (9 years ago)

Author:

r-a-y

Message:

Blogs: Record activity item for blog post if it doesn't exist when a post comment is posted.

Fixes an issue where if "Allow activity stream commenting on blog and forum
posts" is enabled, the activity item for the post comment would not be
created because the activity item for the blog post does not exist.

This might occur if the "Site Tracking" component is enabled after posts
have already been published.

Commit also includes a unit test.

Fixes #6530.

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)

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

@@ -674 +674 @@
             ) );
 
+            // Try to create a new activity item for the parent blog post
+            if ( empty( $parent_activity_id ) ) {
+                $parent_activity_id = bp_activity_post_type_publish( $recorded_comment->comment_post_ID, $recorded_comment->post );
+            }
+
             // we found the parent activity entry
             // so let's go ahead and reconfigure some activity args

trunk/tests/phpunit/testcases/blogs/functions.php

@@ -776 +776 @@
     }
 
+    /**
+     * @group bp_blogs_record_comment
+     */
+    public function test_bp_blogs_record_comment_should_record_parent_blog_post_activity_if_not_found() {
+        // Save the current user and override logged-in user
+        $old_user = get_current_user_id();
+        $u = $this->factory->user->create();
+        $this->set_current_user( $u );
+
+        // Get user details
+        $user = get_userdata( $u );
+
+        // Let's use activity comments instead of single "new_blog_comment" activity items
+        add_filter( 'bp_disable_blogforum_comments', '__return_false' );
+
+        // Create the blog post
+        $post_id = $this->factory->post->create( array(
+            'post_status' => 'publish',
+            'post_type'   => 'post',
+        ) );
+
+        // Now, delete the activity item for the blog post
+        bp_activity_delete( array(
+            'component'         => buddypress()->blogs->id,
+            'type'              => 'new_blog_post',
+            'item_id'           => get_current_blog_id(),
+            'secondary_item_id' => $post_id,
+        ) );
+
+        // Add a comment to blog post
+        wp_new_comment( array(
+            'comment_post_ID' => $post_id,
+            'user_id' => $u,
+            'comment_content' => 'Dummy comment',
+            'comment_author' => 'Dumbo',
+            'comment_author_url' => 'http://buddypress.org',
+
+            // Important to pass check in bp_blogs_record_comment()
+            'comment_author_email' => $user->user_email
+        ) );
+
+        // Fetch the activity ID for the blog post to see if it exists
+        $a1 = bp_activity_get_activity_id( array(
+            'type'      => 'new_blog_post',
+            'component' => buddypress()->blogs->id,
+            'filter'    => array(
+                'item_id' => get_current_blog_id(),
+                'secondary_item_id' => $post_id
+            ),
+        ) );
+
+        // Assert that activity item for blog post was created after adding a comment
+        $this->assertNotNull( $a1, 'Activity item was not created for existing blog post when recording post comment.' );
+
+        $this->set_current_user( $old_user );
+    }
+
     public function count_activity_comment_saved() {
         $this->activity_saved_comment_count += 1;