<!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>[19038] trunk/wp-admin/includes/ms.php: Make wpmu_delete_blog() slightly less crappy.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19038">19038</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-10-21 22:04:52 +0000 (Fri, 21 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make wpmu_delete_blog() slightly less crappy. Prevents the entire network from being dropped in a particularly rare edge case. Removes some zombie code. fixes <a href="http://core.trac.wordpress.org/ticket/19009">#19009</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (19037 => 19038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-10-21 21:50:36 UTC (rev 19037)
+++ trunk/wp-admin/includes/ms.php 2011-10-21 22:04:52 UTC (rev 19038)
</span><span class="lines">@@ -53,16 +53,17 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function wpmu_delete_blog( $blog_id, $drop = false ) {
</span><del>- global $wpdb;
</del><ins>+ global $wpdb, $current_site;
</ins><span class="cx">
</span><span class="cx"> $switch = false;
</span><span class="cx"> if ( $blog_id != $wpdb->blogid ) {
</span><span class="cx"> $switch = true;
</span><span class="cx"> switch_to_blog( $blog_id );
</span><ins>+ $blog = get_blog_details( $blog_id );
+ } else {
+ $blog = $GLOBALS['current_blog'];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
-
</del><span class="cx"> do_action( 'delete_blog', $blog_id, $drop );
</span><span class="cx">
</span><span class="cx"> $users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
</span><span class="lines">@@ -70,23 +71,24 @@
</span><span class="cx"> // Remove users from this blog.
</span><span class="cx"> if ( ! empty( $users ) ) {
</span><span class="cx"> foreach ( $users as $user_id ) {
</span><del>- remove_user_from_blog( $user_id, $blog_id) ;
</del><ins>+ remove_user_from_blog( $user_id, $blog_id );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> update_blog_status( $blog_id, 'deleted', 1 );
</span><span class="cx">
</span><ins>+ // Don't destroy the initial, main, or root blog.
+ if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) )
+ $drop = false;
+
</ins><span class="cx"> if ( $drop ) {
</span><del>- if ( substr( $blog_prefix, -1 ) == '_' )
- $blog_prefix = substr( $blog_prefix, 0, -1 ) . '\_';
</del><span class="cx">
</span><del>- $drop_tables = $wpdb->get_results( "SHOW TABLES LIKE '{$blog_prefix}%'", ARRAY_A );
- $drop_tables = apply_filters( 'wpmu_drop_tables', $drop_tables );
</del><ins>+ $drop_tables = apply_filters( 'wpmu_drop_tables', $wpdb->tables( 'blog' ) );
</ins><span class="cx">
</span><del>- reset( $drop_tables );
- foreach ( (array) $drop_tables as $drop_table) {
- $wpdb->query( "DROP TABLE IF EXISTS ". current( $drop_table ) ."" );
</del><ins>+ foreach ( (array) $drop_tables as $table ) {
+ $wpdb->query( "DROP TABLE IF EXISTS `$table`" );
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->blogs WHERE blog_id = %d", $blog_id ) );
</span><span class="cx"> $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
</span><span class="cx"> $dir = rtrim( $dir, DIRECTORY_SEPARATOR );
</span><span class="lines">@@ -120,17 +122,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key = '{$blog_prefix}autosave_draft_ids'" );
- $blogs = get_site_option( 'blog_list' );
- if ( is_array( $blogs ) ) {
- foreach ( $blogs as $n => $blog ) {
- if ( $blog['blog_id'] == $blog_id )
- unset( $blogs[$n] );
- }
- update_site_option( 'blog_list', $blogs );
- }
-
- if ( $switch === true )
</del><ins>+ if ( $switch )
</ins><span class="cx"> restore_current_blog();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>