Ticket #6834: 6834.patch

src/bp-activity/bp-activity-actions.php

@@ -797 +797 @@
         if ( $new_status === $old_status ) {
                 // An edit of an existing post should update the existing activity item.
                 if ( $new_status == 'publish' ) {
-                        bp_activity_post_type_update( $post );
+                        $edit = bp_activity_post_type_update( $post );
+
+                        // Post was never recorded into activity stream, so record it now!
+                        if ( null === $edit ) {
+                                bp_activity_post_type_publish( $post->ID, $post );
+                        }
                 }
 
                 return;

tests/phpunit/testcases/activity/actions.php

@@ -57 +57 @@
                 // 'new' => 'publish'
                 $this->assertTrue( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Published post type should have activity' );
 
-                // Delete the activity
-                bp_activity_post_type_unpublish( $post_id, $post );
-
-                $post->post_status = 'publish';
-                $post->post_content .= ' foo';
-
-                wp_update_post( $post );
-
-                $this->assertFalse( $this->activity_exists_for_post( $post_id, 'new_foo' ), 'Updating a post type should not create a new activity' );
-
                 _unregister_post_type( 'foo' );
 
                 // Reset globals
@@ -78 +68 @@
          * @group bp_activity_catch_transition_post_type_status
          * @group activity_tracking
          */
+        public function test_bp_activity_catch_transition_post_type_status_publish_existing_post() {
+                $u = $this->factory->user->create();
+
+                $labels = array(
+                        'bp_activity_admin_filter' => 'New Foo',
+                        'bp_activity_front_filter' => 'Foos',
+                        'bp_activity_new_post'    => '%1$s posted a new <a href="%2$s">foo</a>',
+                        'bp_activity_new_post_ms' => '%1$s posted a new <a href="%2$s">foo</a>, on the site %3$s',
+                );
+
+                /**
+                 * 'public' must be set to true, otherwise bp_activity_get_post_types_tracking_args() fails.
+                 */
+                register_post_type( 'foo', array(
+                        'labels'      => $labels,
+                        'public'      => true,
+                        'supports'    => array( 'buddypress-activity' ),
+                        'bp_activity' => array(
+                                'action_id'    => 'new_foo',
+                                'contexts'     => array( 'activity' ),
+                                'position'     => 40,
+                        )
+                ) );
+
+                // Temporarily remove post type activity hook so activity item isn't created.
+                remove_action( 'transition_post_status', 'bp_activity_catch_transition_post_type_status', 10, 3 );
+
+                // Create the initial post.
+                $p = $this->factory->post->create( array(
+                        'post_author' => $u,
+                        'post_type'   => 'foo',
+                ) );
+
+                $this->assertEmpty( bp_activity_get_activity_id( array( 'type' => 'new_foo' ) ) );
+
+                // Add the post type activity hook back.
+                add_action( 'transition_post_status', 'bp_activity_catch_transition_post_type_status', 10, 3 );
+
+                // Emulate updating a post; this should create an activity item.
+                wp_update_post( array(
+                        'ID'     => $p,
+                        'post_title' => 'This is an edit',
+                ) );
+
+                // Assert!
+                $this->assertNotEmpty( bp_activity_get_activity_id( array( 'type' => 'new_foo' ) ), 'Activity item was not created during an edit of an existing WordPress post.' );
+
+                // Clean up.
+                _unregister_post_type( 'foo' );
+        }
+
+        /**
+         * @group bp_activity_catch_transition_post_type_status
+         * @group activity_tracking
+         */
         public function test_bp_activity_catch_transition_post_type_status_publish_password() {
                 $bp = buddypress();