Changeset 12333

Timestamp:

02/19/2019 03:31:05 PM (6 years ago)

Author:

boonebgorges

Message:

Blogs: Ensure activity data integrity when updating post title.

Previously, a missing primary_id could cause the post_title activity meta
value to be updated for activity items unrelated to the one linked to the
updated blog post.

Merges [12311] to the 4.0.x branch.

Props r-a-y.
Fixes #8007.

Location:

branches/4.0

Files:

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

branches/4.0/src/bp-blogs/bp-blogs-functions.php

@@ -663 +663 @@
                     'object'       => $activity_post_object->comments_tracking->component_id,
                     'action'       => $activity_post_object->comments_tracking->action_id,
+                    'primary_id'   => get_current_blog_id(),
                     'secondary_id' => implode( ',', $comment_ids ),
                 );

branches/4.0/tests/phpunit/testcases/blogs/activity.php

@@ -308 +308 @@
 
         $this->assertEquals( $this->comment_post_id, $p );
+    }
+
+    /**
+     * @group post_type_comment_activities
+     */
+    public function test_bp_blogs_update_post_title_activity_meta_should_not_be_the_same_for_same_comment_id() {
+        global $wpdb;
+
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped();
+        }
+
+        if ( function_exists( 'wp_initialize_site' ) ) {
+            $this->setExpectedDeprecated( 'wpmu_new_blog' );
+        }
+
+        $b1 = self::factory()->blog->create();
+        $b2 = self::factory()->blog->create();
+        $b3 = self::factory()->blog->create();
+        $u = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+        $commenter = self::factory()->user->get_object_by_id( $u2 );
+
+        $bids = array( $b1, $b2, $b3 );
+        $pids = array();
+
+        foreach ( $bids as $bid ) {
+            switch_to_blog( $bid );
+
+            // Ensure blog privacy is public so post activities are recorded.
+            update_option( 'blog_public', 1 );
+
+            // Create the post.
+            $pids[ $bid ] = self::factory()->post->create( array(
+                'post_author' => $u,
+            ) );
+
+            /*
+             * Create the post comment.
+             *
+             * Both user_id and comment_author_email are required for unit tests.
+             */
+            $c = self::factory()->comment->create( array(
+                'user_id'         => $u2,
+                'comment_author_email' => $commenter->user_email,
+                'comment_post_ID' => $pids[ $bid ],
+            ) );
+
+            // Approve the comment so the activity item is generated.
+            self::factory()->comment->update_object( $c, array( 'comment_approved' => 1 ) );
+
+            restore_current_blog();
+        }
+
+        // Now update the post title on one blog only.
+        switch_to_blog( $b1 );
+        wp_update_post( array(
+            'ID' => $pids[ $b1 ],
+            'post_title' => 'Updated'
+        ) );
+        restore_current_blog();
+
+        // Check our activity meta to see if the post title is different.
+        $aids = bp_activity_get( array(
+            'fields' => 'ids',
+            'filter' => array(
+                'action' => 'new_blog_comment'
+            )
+        ) );
+        $aids= $aids['activities'];
+        foreach ( $aids as $aid ) {
+            // Skip the check for the correct blog.
+            $a = new BP_Activity_Activity( $aid );
+            if ( $a->item_id == $b1 ) {
+                continue;
+            }
+
+            // Assert that post title is different.
+            $post_title = bp_activity_get_meta( $aid, 'post_title' );
+            $this->assertFalse( 'Updated' === $post_title, 'Post title should not be the same across all sites with the same post comment ID' );
+        }
     }