Ticket #5333: 5333-1.patch

bp-blogs/bp-blogs-functions.php

@@ -247 +247 @@
 add_action( 'update_option_blogdescription', 'bp_blogs_update_option_blogdescription', 10, 2 );
 
 /**
- * Detect a change in post status, and initiate an activity update if necessary.
+ * Detect a publish change in post status, and initiate an activity update if necessary.
  *
  * Posts get new activity updates when (a) they are being published, and (b)
  * they have not already been published. This enables proper posting for
@@ -259 +259 @@
  *
  * @param string $new_status New status for the post.
  * @param string $old_status Old status for the post.
- * @param object $post Post data.
+ * @param WP_Post $post Post data.
  */
 function bp_blogs_catch_published_post( $new_status, $old_status, $post ) {
 
@@ -278 +278 @@
 add_action( 'transition_post_status', 'bp_blogs_catch_published_post', 10, 3 );
 
 /**
+ * Detect a un-publish change in post status, and initiate an activity update if necessary.
+ *
+ * Posts have their activity updates removed when (a) they are being trashed or set to draft, and (b) they were already published.
+ * See #4090, #3746, #2546 for background.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param string $new_status New status for the post.
+ * @param string $old_status Old status for the post.
+ * @param WP_Post $post Post data.
+ */
+function bp_blogs_catch_withdrawn_posts( $new_status, $old_status, $post ) {
+
+        // If the post wasn't already published, it won't have an activity stream item.
+        if ( 'publish' !== $old_status )
+                return;
+
+        // Only handle if the post is being trashed or set back to draft.
+        if ( ! in_array( $new_status, array( 'draft', 'trash' ) ) )
+                return;
+
+        bp_blogs_remove_post( $post->ID );
+}
+add_action( 'transition_post_status', 'bp_blogs_catch_withdrawn_posts', 10, 3 );
+add_action( 'delete_post', 'bp_blogs_remove_post' );
+
+/**
  * Record a new blog post in the BuddyPress activity stream.
  *
  * @param int $post_id ID of the post being recorded.
@@ -595 +622 @@
  * @param int $blog_id Optional. Defaults to current blog ID.
  * @param int $user_id Optional. Defaults to the logged-in user ID. This param
  *        is currently unused in the function (but is passed to hooks).
+ * @param WP_Post $post The post's object which is being removed. Optional.
  */
 function bp_blogs_remove_post( $post_id, $blog_id = 0, $user_id = 0 ) {
         global $wpdb, $bp;
@@ -617 +645 @@
 
         do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $user_id );
 }
-add_action( 'delete_post', 'bp_blogs_remove_post' );
 
 /**
  * Remove a blog comment activity item from the activity stream.