Changeset 22092 for trunk/wp-admin/includes/ms.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-admin/includes/ms.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -56 +56 @@
 
     $switch = false;
-    if ( $blog_id != $wpdb->blogid ) {
+    if ( get_current_blog_id() != $blog_id ) {
         $switch = true;
         switch_to_blog( $blog_id );
-        $blog = get_blog_details( $blog_id );
-    } else {
-        $blog = $GLOBALS['current_blog'];
-    }
+    }
+
+    $blog = get_blog_details( $blog_id );
 
     do_action( 'delete_blog', $blog_id, $drop );
@@ -82 +81 @@
 
     if ( $drop ) {
-
         $drop_tables = apply_filters( 'wpmu_drop_tables', $wpdb->tables( 'blog' ) );
 
@@ -123 +121 @@
             @rmdir( $dir );
         }
+
+        clean_blog_cache( $blog );
     }