Changeset 5774

Timestamp:

05/21/2015 08:50:34 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Cache: Much more sane cache invalidation.

This change improves hierarchical forum/topic/reply cache invalidations by not requiring each call to be strategically placed between actions to avoid race conditions.

Props thebrandonallen. Fixes #2800.

Location:

trunk/src/includes/core

Files:

• actions.php (modified) (1 diff)
• cache.php (modified) (2 diffs)

trunk/src/includes/core/actions.php

@@ -295 +295 @@
 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 bbPress post caches when WordPress's is cleaned
+add_action( 'clean_post_cache', 'bbp_clean_post_cache' );
 
 /**

trunk/src/includes/core/cache.php

@@ -142 +142 @@
     }
 
+    // Child query types to clean
+    $post_types = array(
+        bbp_get_forum_post_type(),
+        bbp_get_topic_post_type(),
+        bbp_get_reply_post_type()
+    );
+
+    // Bail if not a bbPress post type
+    if ( ! in_array( $_post->post_type, $post_types, true ) ) {
+        return;
+    }
+
     wp_cache_delete( $_post->ID, 'posts'     );
     wp_cache_delete( $_post->ID, 'post_meta' );
@@ -148 +160 @@
 
     do_action( 'bbp_clean_post_cache', $_post->ID, $_post );
-
-    // Child query types to clean
-    $post_types = array(
-        bbp_get_topic_post_type(),
-        bbp_get_forum_post_type(),
-        bbp_get_reply_post_type()
-    );
 
     // Loop through query types and clean caches