Changeset 19038

Timestamp:

10/21/2011 10:04:52 PM (15 years ago)

Author:

nacin

Message:

Make wpmu_delete_blog() slightly less crappy. Prevents the entire network from being dropped in a particularly rare edge case. Removes some zombie code. fixes #19009.

File:

• trunk/wp-admin/includes/ms.php (modified) (5 diffs)

trunk/wp-admin/includes/ms.php

@@ -54 +54 @@
  */
 function wpmu_delete_blog( $blog_id, $drop = false ) {
-        global $wpdb;
+        global $wpdb, $current_site;
 
         $switch = false;
@@ -60 +60 @@
                 $switch = true;
                 switch_to_blog( $blog_id );
-        }
-
-        $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
+                $blog = get_blog_details( $blog_id );
+        } else {
+                $blog = $GLOBALS['current_blog'];
+        }
 
         do_action( 'delete_blog', $blog_id, $drop );
@@ -71 +72 @@
         if ( ! empty( $users ) ) {
                 foreach ( $users as $user_id ) {
-                        remove_user_from_blog( $user_id, $blog_id) ;
+                        remove_user_from_blog( $user_id, $blog_id );
                 }
         }
@@ -77 +78 @@
         update_blog_status( $blog_id, 'deleted', 1 );
 
+        // Don't destroy the initial, main, or root blog.
+        if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) )
+                $drop = false;
+
         if ( $drop ) {
-                if ( substr( $blog_prefix, -1 ) == '_' )
-                        $blog_prefix =  substr( $blog_prefix, 0, -1 ) . '\_';
-
-                $drop_tables = $wpdb->get_results( "SHOW TABLES LIKE '{$blog_prefix}%'", ARRAY_A );
-                $drop_tables = apply_filters( 'wpmu_drop_tables', $drop_tables );
-
-                reset( $drop_tables );
-                foreach ( (array) $drop_tables as $drop_table) {
-                        $wpdb->query( "DROP TABLE IF EXISTS ". current( $drop_table ) ."" );
-                }
+
+                $drop_tables = apply_filters( 'wpmu_drop_tables', $wpdb->tables( 'blog' ) );
+
+                foreach ( (array) $drop_tables as $table ) {
+                        $wpdb->query( "DROP TABLE IF EXISTS `$table`" );
+                }
+
                 $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
                 $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
@@ -121 +123 @@
         }
 
-        $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key = '{$blog_prefix}autosave_draft_ids'" );
-        $blogs = get_site_option( 'blog_list' );
-        if ( is_array( $blogs ) ) {
-                foreach ( $blogs as $n => $blog ) {
-                        if ( $blog['blog_id'] == $blog_id )
-                                unset( $blogs[$n] );
-                }
-                update_site_option( 'blog_list', $blogs );
-        }
-
-        if ( $switch === true )
+        if ( $switch )
                 restore_current_blog();
 }