Changeset 30404 for trunk/tests/phpunit/tests/multisite/ms-files-rewriting.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/tests/phpunit/tests/multisite/ms-files-rewriting.php (modified) (1 diff)

trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -56 +56 @@
         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'] ) );
+    }
 }