Changeset 30404 for trunk/src/wp-admin/includes/ms.php

Timestamp:

11/20/2014 06:52:07 AM (10 years ago)

Author:

jeremyfelt

Message:

Prevent wpmu_delete_blog from removing the wrong uploads directory

wp_upload_dir() includes some logic to fall back to the default site's upload directory if a specific directory for the requested site cannot be found. Because of this, if wpmu_delete_blog() is fired twice in a row for the same site, the main site's upload directory could be deleted as well.

This adds some checks in wpmu_delete_blog() so that we are confident in the site and it's upload directory's existence before dropping the site. Tests are added for when ms_files_rewriting is enabled or disabled.

Fixes #30121

File:

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

trunk/src/wp-admin/includes/ms.php

@@ -86 +86 @@
     $current_site = get_current_site();
 
+    // If a full blog object is not available, do not destroy anything.
+    if ( $drop && ! $blog ) {
+        $drop = false;
+    }
+
     // 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 ) ) )
+    if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
         $drop = false;
+    }
+
+    $upload_path = trim( get_option( 'upload_path' ) );
+
+    // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
+    if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+        $drop = false;
+    }
 
     if ( $drop ) {
+        $uploads = wp_upload_dir();
+
         $tables = $wpdb->tables( 'blog' );
         /**
@@ -108 +123 @@
         $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
 
-        $uploads = wp_upload_dir();
         /**
          * Filter the upload base directory to delete when the blog is deleted.