Changeset 22092 for trunk/wp-includes/ms-blogs.php

Timestamp:

10/01/2012 06:03:23 PM (13 years ago)

Author:

ryan

Message:

• Register blog-id-cache group as global
• Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
• Don't db escape cache keys in get_blog_id_from_url()
• prepare() the query in get_blog_id_from_url()
• Return 0 for all failures in get_blog_id_from_url()
• clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.

File:

• trunk/wp-includes/ms-blogs.php (modified) (4 diffs)

trunk/wp-includes/ms-blogs.php

@@ -254 +254 @@
     $details = get_blog_details( $blog_id, false );
 
-    wp_cache_delete( $blog_id , 'blog-details' );
-    wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-    wp_cache_delete( md5( $details->domain . $details->path )  , 'blog-lookup' );
-    wp_cache_delete( 'current_blog_' . $details->domain, 'site-options' );
-    wp_cache_delete( 'current_blog_' . $details->domain . $details->path, 'site-options' );
-    wp_cache_delete( 'get_id_from_blogname_' . trim( $details->path, '/' ), 'blog-details' );
+    clean_blog_cache( $details );
 
     do_action( 'refresh_blog_details', $blog_id );
@@ -315 +310 @@
 
     return true;
+}
+
+/**
+ * Clean the blog cache
+ *
+ * @since 3.5.0
+ *
+ * @param stdClass $blog The blog details as returned from get_blog_details()
+ */
+function clean_blog_cache( $blog ) {
+    $blog_id = $blog->blog_id;
+    $domain_path_key = md5( $blog->domain . $blog->path );
+
+    wp_cache_delete( $blog_id , 'blog-details' );
+    wp_cache_delete( $blog_id . 'short' , 'blog-details' );
+    wp_cache_delete(  $domain_path_key, 'blog-lookup' );
+    wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
+    wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
+    wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
+    wp_cache_delete( $domain_path_key, 'blog-id-cache' );
 }
 
@@ -493 +508 @@
                 wp_cache_add_global_groups( $global_groups );
             else
-                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
+                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
             wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
         }
@@ -554 +569 @@
                 wp_cache_add_global_groups( $global_groups );
             else
-                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts' ) );
+                wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', ' blog-id-cache' ) );
             wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
         }