vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-02 17:40:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent wpmu_delete_blog from removing the wrong uploads directory

Browse Source 
`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


git-svn-id: https://develop.svn.wordpress.org/trunk@30404 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2014-11-20 06:52:07 +00:00
parent 642f9cc7e7
commit 3223d4a4b3
3 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/phpunit/tests/multisite/ms-files-rewriting.php
View File

@@ -55,6 +55,37 @@ class Tests_Multisite_MS_Files_Rewriting extends WP_UnitTestCase {
$this->assertEquals( '', $info2['error'] );
restore_current_blog();
}
/**
* When a site is deleted with wpmu_delete_blog(), only the files associated with
* that site should be removed. When wpmu_delete_blog() is run a second time, nothing
* should change with upload directories.
*/
function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_files() {
$filename = rand_str().'.jpg';
$contents = rand_str();
// Upload a file to the main site on the network.
$file1 = wp_upload_bits( $filename, null, $contents );
$blog_id = $this->factory->blog->create();
switch_to_blog( $blog_id );
$file2 = wp_upload_bits( $filename, null, $contents );
restore_current_blog();
wpmu_delete_blog( $blog_id, true );
// The file on the main site should still exist. The file on the deleted site should not.
$this->assertTrue( file_exists( $file1['file'] ) );
$this->assertFalse( file_exists( $file2['file'] ) );
wpmu_delete_blog( $blog_id, true );
// The file on the main site should still exist. The file on the deleted site should not.
$this->assertTrue( file_exists( $file1['file'] ) );
$this->assertFalse( file_exists( $file2['file'] ) );
}
}
endif;

31
tests/phpunit/tests/multisite/site.php
View File

@@ -274,6 +274,37 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
$this->assertEquals( 1, get_blog_count() );
}
/**
* When a site is deleted with wpmu_delete_blog(), only the files associated with
* that site should be removed. When wpmu_delete_blog() is run a second time, nothing
* should change with upload directories.
*/
function test_upload_directories_after_multiple_wpmu_delete_blog() {
$filename = rand_str().'.jpg';
$contents = rand_str();
// Upload a file to the main site on the network.
$file1 = wp_upload_bits( $filename, null, $contents );
$blog_id = $this->factory->blog->create();
switch_to_blog( $blog_id );
$file2 = wp_upload_bits( $filename, null, $contents );
restore_current_blog();
wpmu_delete_blog( $blog_id, true );
// The file on the main site should still exist. The file on the deleted site should not.
$this->assertTrue( file_exists( $file1['file'] ) );
$this->assertFalse( file_exists( $file2['file'] ) );
wpmu_delete_blog( $blog_id, true );
// The file on the main site should still exist. The file on the deleted site should not.
$this->assertTrue( file_exists( $file1['file'] ) );
$this->assertFalse( file_exists( $file2['file'] ) );
}
function test_wpmu_update_blogs_date() {
global $wpdb;