WordPress.org

Make WordPress Core


Ignore:
Timestamp:
11/20/2014 06:52:07 AM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/multisite/site.php

    r30286 r30404  
    275275    }
    276276
     277    /**
     278     * When a site is deleted with wpmu_delete_blog(), only the files associated with
     279     * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
     280     * should change with upload directories.
     281     */
     282    function test_upload_directories_after_multiple_wpmu_delete_blog() {
     283        $filename = rand_str().'.jpg';
     284        $contents = rand_str();
     285
     286        // Upload a file to the main site on the network.
     287        $file1 = wp_upload_bits( $filename, null, $contents );
     288
     289        $blog_id = $this->factory->blog->create();
     290
     291        switch_to_blog( $blog_id );
     292        $file2 = wp_upload_bits( $filename, null, $contents );
     293        restore_current_blog();
     294
     295        wpmu_delete_blog( $blog_id, true );
     296
     297        // The file on the main site should still exist. The file on the deleted site should not.
     298        $this->assertTrue( file_exists( $file1['file'] ) );
     299        $this->assertFalse( file_exists( $file2['file'] ) );
     300
     301        wpmu_delete_blog( $blog_id, true );
     302
     303        // The file on the main site should still exist. The file on the deleted site should not.
     304        $this->assertTrue( file_exists( $file1['file'] ) );
     305        $this->assertFalse( file_exists( $file2['file'] ) );
     306    }
     307
    277308    function test_wpmu_update_blogs_date() {
    278309        global $wpdb;
Note: See TracChangeset for help on using the changeset viewer.