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/ms-files-rewriting.php

    r30286 r30404  
    5656        restore_current_blog();
    5757    }
     58
     59    /**
     60     * When a site is deleted with wpmu_delete_blog(), only the files associated with
     61     * that site should be removed. When wpmu_delete_blog() is run a second time, nothing
     62     * should change with upload directories.
     63     */
     64    function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_files() {
     65        $filename = rand_str().'.jpg';
     66        $contents = rand_str();
     67
     68        // Upload a file to the main site on the network.
     69        $file1 = wp_upload_bits( $filename, null, $contents );
     70
     71        $blog_id = $this->factory->blog->create();
     72
     73        switch_to_blog( $blog_id );
     74        $file2 = wp_upload_bits( $filename, null, $contents );
     75        restore_current_blog();
     76
     77        wpmu_delete_blog( $blog_id, true );
     78
     79        // The file on the main site should still exist. The file on the deleted site should not.
     80        $this->assertTrue( file_exists( $file1['file'] ) );
     81        $this->assertFalse( file_exists( $file2['file'] ) );
     82
     83        wpmu_delete_blog( $blog_id, true );
     84
     85        // The file on the main site should still exist. The file on the deleted site should not.
     86        $this->assertTrue( file_exists( $file1['file'] ) );
     87        $this->assertFalse( file_exists( $file2['file'] ) );
     88    }
    5889}
    5990
Note: See TracChangeset for help on using the changeset viewer.