Ticket #2800: 2800.02.patch

src/includes/core/actions.php

@@ -294 +294 @@
 add_action( 'bbp_new_reply_pre_extras',  'bbp_clean_post_cache' );
 add_action( 'bbp_new_reply_post_extras', 'bbp_clean_post_cache' );
 
-// Clean caches on deleted/spammed/unspammed/trashed/untrashed actions
-add_action( 'bbp_approved_reply',   'bbp_clean_post_cache', 999 );
-add_action( 'bbp_approved_topic',   'bbp_clean_post_cache', 999 );
-add_action( 'bbp_deleted_reply',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_deleted_topic',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_spammed_reply',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_spammed_topic',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_trashed_reply',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_trashed_topic',    'bbp_clean_post_cache', 999 );
-add_action( 'bbp_unapproved_reply', 'bbp_clean_post_cache', 999 );
-add_action( 'bbp_unapproved_topic', 'bbp_clean_post_cache', 999 );
-add_action( 'bbp_unspammed_reply',  'bbp_clean_post_cache', 999 );
-add_action( 'bbp_unspammed_topic',  'bbp_clean_post_cache', 999 );
-add_action( 'bbp_untrashed_reply',  'bbp_clean_post_cache', 999 );
-add_action( 'bbp_untrashed_topic',  'bbp_clean_post_cache', 999 );
+// Clean our cache when WP cleans theirs
+add_action( 'clean_post_cache', 'bbp_clean_post_cache' );
 
 /**
  * bbPress needs to redirect the user around in a few different circumstances:

src/includes/core/cache.php

@@ -141 +141 @@
                 return;
         }
 
-        wp_cache_delete( $_post->ID, 'posts'     );
-        wp_cache_delete( $_post->ID, 'post_meta' );
-
-        clean_object_term_cache( $_post->ID, $_post->post_type );
-
-        do_action( 'bbp_clean_post_cache', $_post->ID, $_post );
-
         // Child query types to clean
         $post_types = array(
                 bbp_get_topic_post_type(),
@@ -155 +148 @@
                 bbp_get_reply_post_type()
         );
 
+        // Make sure we're working with BBP post types
+        if ( ! in_array( $_post->post_type, $post_types ) ) {
+                return;
+        }
+
+        wp_cache_delete( $_post->ID, 'posts'     );
+        wp_cache_delete( $_post->ID, 'post_meta' );
+
+        clean_object_term_cache( $_post->ID, $_post->post_type );
+
+        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' );