Changeset 9251 for trunk/src/bp-blogs/bp-blogs-cache.php

Timestamp:

12/22/2014 03:49:43 AM (12 years ago)

Author:

r-a-y

Message:

Blogs: Invalidate total blog count when site is deleted.

This commit:

• Uses bp_blogs_clear_blog_object_cache() to invalidate the total blog count after a site is deleted and when a site is created.
• Deprecates bp_blogs_format_clear_blog_cache(), a function that isn't used internally as of this commit, for v2.2.0.
• Adds a unit test.

Fixes #6062.

File:

• trunk/src/bp-blogs/bp-blogs-cache.php (modified) (2 diffs)

trunk/src/bp-blogs/bp-blogs-cache.php

@@ -43 +43 @@
  * @param int $user_id ID of the user whose blog cache should be cleared.
  */
-function bp_blogs_clear_blog_object_cache( $blog_id, $user_id ) {
-        wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, 'bp' );
-        wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
-}
+function bp_blogs_clear_blog_object_cache( $blog_id = 0, $user_id = 0 ) {
+        if ( ! empty( $user_id ) ) {
+                wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, 'bp' );
+                wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+        }
 
-/**
- * Clear cache when a new blog is created.
- *
- * @since BuddyPress (1.0.0)
- *
- * @param BP_Blogs_Blog $recorded_blog_obj The recorded blog, passed by
- *        'bp_blogs_new_blog'.
- */
-function bp_blogs_format_clear_blog_cache( $recorded_blog_obj ) {
-        bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
         wp_cache_delete( 'bp_total_blogs', 'bp' );
 }
@@ -63 +54 @@
 // List actions to clear object caches on
 add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_clear_blog_object_cache', 10, 2 );
-add_action( 'bp_blogs_new_blog',             'bp_blogs_format_clear_blog_cache', 10, 2 );
+add_action( 'wpmu_new_blog',                 'bp_blogs_clear_blog_object_cache', 10, 2 );
+add_action( 'bp_blogs_remove_blog',          'bp_blogs_clear_blog_object_cache' );
 
 // List actions to clear super cached pages on, if super cache is installed