<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[30404] trunk: Prevent wpmu_delete_blog from removing the wrong uploads directory</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30404">30404</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30404","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-20 06:52:07 +0000 (Thu, 20 Nov 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/30121">#30121</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitemsfilesrewritingphp">trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2014-11-20 05:17:42 UTC (rev 30403)
+++ trunk/src/wp-admin/includes/ms.php 2014-11-20 06:52:07 UTC (rev 30404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,11 +85,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site = get_current_site();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If a full blog object is not available, do not destroy anything.
+ if ( $drop && ! $blog ) {
+ $drop = false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't destroy the initial, main, or root blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $drop = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $drop ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads = wp_upload_dir();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $tables = $wpdb->tables( 'blog' );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the tables to drop when the blog is deleted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +122,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploads = wp_upload_dir();
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the upload base directory to delete when the blog is deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitemsfilesrewritingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2014-11-20 05:17:42 UTC (rev 30403)
+++ trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php 2014-11-20 06:52:07 UTC (rev 30404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +55,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '', $info2['error'] );
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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'] ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2014-11-20 05:17:42 UTC (rev 30403)
+++ trunk/tests/phpunit/tests/multisite/site.php 2014-11-20 06:52:07 UTC (rev 30404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,6 +274,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, get_blog_count() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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'] ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_wpmu_update_blogs_date() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>