Changeset 9251

Timestamp:

12/22/2014 03:49:43 AM (11 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.

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-cache.php (modified) (2 diffs)
• src/bp-core/deprecated/2.2.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/cache.php (modified) (1 diff)

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

trunk/src/bp-core/deprecated/2.2.php

@@ -64 +64 @@
     bp_activity_post_type_update( $post );
 }
+
+/**
+ * Clear cache when a new blog is created.
+ *
+ * @since BuddyPress (1.0.0)
+ * @deprecated BuddyPress (2.2.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 ) {
+    _deprecated_function( __FUNCTION__, '2.2', 'bp_blogs_clear_blog_object_cache()' );
+    bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
+}

trunk/tests/phpunit/testcases/blogs/cache.php

@@ -255 +255 @@
         $this->assertEquals( $first_query_count, $wpdb->num_queries );
     }
+
+    /**
+     * @group bp_blogs_total_blogs
+     */
+    public function test_bp_blogs_total_blogs_count_after_delete_blog() {
+        if ( ! is_multisite() ) {
+            return;
+        }
+
+        $u = $this->factory->user->create();
+
+        // need to make sure we set the 'public' flag due to how BP_Blogs_Blogs:get_all() works
+        $b1 = $this->factory->blog->create( array(
+            'meta' => array(
+                'public' => 1
+            )
+        ) );
+        $b2 = $this->factory->blog->create( array(
+            'meta' => array(
+                'public' => 1
+            )
+        ) );
+
+        bp_blogs_record_blog( $b1, $u );
+        bp_blogs_record_blog( $b2, $u );
+
+        // prime total blog count
+        bp_blogs_total_blogs();
+
+        // delete a blog
+        wpmu_delete_blog( $b2 );
+
+        $this->assertEquals( 1, bp_blogs_total_blogs() );
+    }
 }