Ticket #2813: 2813.01.patch

src/includes/core/actions.php

@@ -295 +295 @@
 add_action( 'bbp_new_reply_post_extras', 'bbp_clean_post_cache' );
 
 // Clean bbPress post caches when WordPress's is cleaned
-add_action( 'clean_post_cache', 'bbp_clean_post_cache' );
+add_action( 'clean_post_cache', 'bbp_clean_post_cache', 10, 2 );
 
 /**
  * bbPress needs to redirect the user around in a few different circumstances:

src/includes/core/cache.php

@@ -130 +130 @@
  *
  * @since bbPress (r4040)
  *
+ * @param mixed $post The post object or ID to remove from the cache. Defaults to null.
+ * @param mixed $post_object The post object to remove from the cache. Defaults to null.
+ * @uses get_post() To get the post object.
+ * @uses bbp_get_forum_post_type() To get the forum post type.
+ * @uses bbp_get_topic_post_type() To get the topic post type.
+ * @uses bbp_get_reply_post_type() To get the reply post type.
+ * @uses wp_cache_delete() To delete the cache item.
+ * @uses clean_object_term_cache() To clean the term cache.
+ * @uses bbp_clean_post_cache() Recursion.
  * @uses do_action() Calls 'bbp_clean_post_cache' on $id
- * @param object|int $_post The post object or ID to remove from the cache
  */
-function bbp_clean_post_cache( $_post = '' ) {
+function bbp_clean_post_cache( $post = null, $post_object = null ) {
+
+        // Make sure $post_object is a WP_Post object
+        if ( $post_object instanceof WP_Post ) {
+                $post = $post_object;
+        }
 
         // Bail if no post
-        $_post = get_post( $_post );
-        if ( empty( $_post ) ) {
+        $post = get_post( $post );
+        if ( empty( $post ) ) {
                 return;
         }
 
@@ -149 +162 @@
         );
 
         // Bail if not a bbPress post type
-        if ( ! in_array( $_post->post_type, $post_types, true ) ) {
+        if ( ! in_array( $post->post_type, $post_types, true ) ) {
                 return;
         }
 
-        wp_cache_delete( $_post->ID, 'posts'     );
-        wp_cache_delete( $_post->ID, 'post_meta' );
+        wp_cache_delete( $post->ID, 'posts'     );
+        wp_cache_delete( $post->ID, 'post_meta' );
 
-        clean_object_term_cache( $_post->ID, $_post->post_type );
+        clean_object_term_cache( $post->ID, $post->post_type );
 
-        do_action( 'bbp_clean_post_cache', $_post->ID, $_post );
+        do_action( 'bbp_clean_post_cache', $post->ID, $post );
 
         // Loop through query types and clean caches
         foreach ( $post_types as $post_type ) {
-                wp_cache_delete( 'bbp_get_forum_'     . $_post->ID . '_reply_id',                              'bbpress_posts' );
-                wp_cache_delete( 'bbp_parent_'        . $_post->ID . '_type_' . $post_type . '_child_last_id', 'bbpress_posts' );
-                wp_cache_delete( 'bbp_parent_'        . $_post->ID . '_type_' . $post_type . '_child_count',   'bbpress_posts' );
-                wp_cache_delete( 'bbp_parent_public_' . $_post->ID . '_type_' . $post_type . '_child_ids',     'bbpress_posts' );
-                wp_cache_delete( 'bbp_parent_all_'    . $_post->ID . '_type_' . $post_type . '_child_ids',     'bbpress_posts' );
+                wp_cache_delete( 'bbp_get_forum_'     . $post->ID . '_reply_id',                              'bbpress_posts' );
+                wp_cache_delete( 'bbp_parent_'        . $post->ID . '_type_' . $post_type . '_child_last_id', 'bbpress_posts' );
+                wp_cache_delete( 'bbp_parent_'        . $post->ID . '_type_' . $post_type . '_child_count',   'bbpress_posts' );
+                wp_cache_delete( 'bbp_parent_public_' . $post->ID . '_type_' . $post_type . '_child_ids',     'bbpress_posts' );
+                wp_cache_delete( 'bbp_parent_all_'    . $post->ID . '_type_' . $post_type . '_child_ids',     'bbpress_posts' );
         }
 
         // Invalidate parent caches
-        if ( ! empty( $_post->post_parent ) ) {
-                bbp_clean_post_cache( $_post->post_parent );
+        if ( ! empty( $post->post_parent ) ) {
+                bbp_clean_post_cache( $post->post_parent );
         }
 }