Changeset 4041

Timestamp:

07/01/2012 11:50:30 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Caches:

• Introduce bbp_clean_post_cache() to handle cleaning custom queries and post ancestors.
• Audit use of _pre_ and _post_ forum/topic/reply actions and locations. Reposition and pass parents as needed.
• Add 'bbp_clean_post_cache' action to necessary _pre_ and _post_ actions.
• Fixes #1861.

Location:

branches/plugin/bbp-includes

Files:

• bbp-core-actions.php (modified) (1 diff)
• bbp-core-cache.php (modified) (1 diff)
• bbp-forum-functions.php (modified) (2 diffs)
• bbp-reply-functions.php (modified) (2 diffs)
• bbp-topic-functions.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-actions.php

@@ -218 +218 @@
 add_action( 'bbp_new_topic', 'bbp_global_access_auto_role' );
 add_action( 'bbp_new_reply', 'bbp_global_access_auto_role' );
+
+// Caches
+add_action( 'bbp_new_forum_pre_extras',  'bbp_clean_post_cache' );
+add_action( 'bbp_new_forum_post_extras', 'bbp_clean_post_cache' );
+add_action( 'bbp_new_topic_pre_extras',  'bbp_clean_post_cache' );
+add_action( 'bbp_new_topic_post_extras', 'bbp_clean_post_cache' );
+add_action( 'bbp_new_reply_pre_extras',  'bbp_clean_post_cache' );
+add_action( 'bbp_new_reply_post_extras', 'bbp_clean_post_cache' );
 
 /**

branches/plugin/bbp-includes/bbp-core-cache.php

@@ -119 +119 @@
 }
 new BBP_Skip_Children();
+
+/** General *******************************************************************/
+
+/**
+ * Will clean a post in the cache.
+ *
+ * Will call to clean the term object cache associated with the post ID.
+ *
+ * @since bbPress (r4040)
+ *
+ * @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 ) {
+    global $wpdb;
+
+    // Bail if no post
+    $post = get_post( $post );
+    if ( empty( $post ) )
+        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(), bbp_get_forum_post_type(), bbp_get_reply_post_type() );
+
+    // Loop through query types and clean caches
+    foreach ( $post_types as $post_type ) {
+        wp_cache_delete( 'bbp_get_forum_'     . $post->ID . '_reply_id',                              'bbpress' );
+        wp_cache_delete( 'bbp_parent_'        . $post->ID . '_type_' . $post_type . '_child_last_id', 'bbpress' );
+        wp_cache_delete( 'bbp_parent_'        . $post->ID . '_type_' . $post_type . '_child_count',   'bbpress' );
+        wp_cache_delete( 'bbp_parent_public_' . $post->ID . '_type_' . $post_type . '_child_ids',     'bbpress' );
+        wp_cache_delete( 'bbp_parent_all_'    . $post->ID . '_type_' . $post_type . '_child_ids',     'bbpress' );
+    }
+
+    // Invalidate parent caches
+    if ( $parent = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_type FROM $wpdb->posts WHERE ID = %d", $post->post_parent ) ) )
+        bbp_clean_post_cache( $parent );
+}

branches/plugin/bbp-includes/bbp-forum-functions.php

@@ -229 +229 @@
     /** Additional Actions (Before Save) **************************************/
 
-    do_action( 'bbp_new_forum_pre_extras' );
-
     // Bail if errors
     if ( bbp_has_errors() )
@@ -236 +234 @@
 
     /** No Errors *************************************************************/
+
+    do_action( 'bbp_new_forum_pre_extras', $forum_parent_id );
 
     // Add the content of the form to $forum_data as an array

branches/plugin/bbp-includes/bbp-reply-functions.php

@@ -228 +228 @@
 
     /** Additional Actions (Before Save) **************************************/
-
-    do_action( 'bbp_new_reply_pre_extras' );
     
     // Bail if errors
@@ -236 +234 @@
 
     /** No Errors *************************************************************/
+
+    do_action( 'bbp_new_reply_pre_extras', $topic_id, $forum_id );
 
     // Add the content of the form to $reply_data as an array

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -265 +265 @@
     /** No Errors *************************************************************/
 
-    do_action( 'bbp_new_topic_pre_extras' );
+    do_action( 'bbp_new_topic_pre_extras', $forum_id );
 
     // Add the content of the form to $topic_data as an array.