<!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>[22185] trunk/wp-includes/ms-blogs.php: Sync actions between update_blog_details() and update_blog_status().</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/22185">22185</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-11 12:37:46 +0000 (Thu, 11 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sync actions between update_blog_details() and update_blog_status(). Add make_delete_blog and make_undelete_blog actions.
Props Kyrylo, wonderboymusic
fixes <a href="http://core.trac.wordpress.org/ticket/20305">#20305</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (22184 => 22185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2012-10-11 04:11:47 UTC (rev 22184)
+++ trunk/wp-includes/ms-blogs.php 2012-10-11 12:37:46 UTC (rev 22185)
</span><span class="lines">@@ -292,17 +292,44 @@
</span><span class="cx"> foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
</span><span class="cx"> $update_details[$field] = $details[$field];
</span><span class="cx">
</span><del>- $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
</del><ins>+ $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
</ins><span class="cx">
</span><ins>+ if ( false === $result )
+ return false;
+
</ins><span class="cx"> // If spam status changed, issue actions.
</span><span class="cx"> if ( $details[ 'spam' ] != $current_details[ 'spam' ] ) {
</span><span class="cx"> if ( $details[ 'spam' ] == 1 )
</span><del>- do_action( "make_spam_blog", $blog_id );
</del><ins>+ do_action( 'make_spam_blog', $blog_id );
</ins><span class="cx"> else
</span><del>- do_action( "make_ham_blog", $blog_id );
</del><ins>+ do_action( 'make_ham_blog', $blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($details[ 'public' ]) ) {
</del><ins>+ // If mature status changed, issue actions.
+ if ( $details[ 'mature' ] != $current_details[ 'mature' ] ) {
+ if ( $details[ 'mature' ] == 1 )
+ do_action( 'mature_blog', $blog_id );
+ else
+ do_action( 'unmature_blog', $blog_id );
+ }
+
+ // If archived status changed, issue actions.
+ if ( $details[ 'archived' ] != $current_details[ 'archived' ] ) {
+ if ( $details[ 'archived' ] == 1 )
+ do_action( 'archive_blog', $blog_id );
+ else
+ do_action( 'unarchive_blog', $blog_id );
+ }
+
+ // If deleted status changed, issue actions.
+ if ( $details[ 'deleted' ] != $current_details[ 'deleted' ] ) {
+ if ( $details[ 'deleted' ] == 1 )
+ do_action( 'make_delete_blog', $blog_id );
+ else
+ do_action( 'make_undelete_blog', $blog_id );
+ }
+
+ if ( isset( $details[ 'public' ] ) ) {
</ins><span class="cx"> switch_to_blog( $blog_id );
</span><span class="cx"> update_option( 'blog_public', $details[ 'public' ] );
</span><span class="cx"> restore_current_blog();
</span><span class="lines">@@ -642,21 +669,24 @@
</span><span class="cx"> if ( null !== $deprecated )
</span><span class="cx"> _deprecated_argument( __FUNCTION__, '3.1' );
</span><span class="cx">
</span><del>- if ( !in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
</del><ins>+ if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
</ins><span class="cx"> return $value;
</span><span class="cx">
</span><del>- $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
</del><ins>+ $result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
</ins><span class="cx">
</span><del>- refresh_blog_details($blog_id);
</del><ins>+ if ( false === $result )
+ return false;
</ins><span class="cx">
</span><ins>+ refresh_blog_details( $blog_id );
+
</ins><span class="cx"> if ( 'spam' == $pref )
</span><span class="cx"> ( $value == 1 ) ? do_action( 'make_spam_blog', $blog_id ) : do_action( 'make_ham_blog', $blog_id );
</span><span class="cx"> elseif ( 'mature' == $pref )
</span><span class="cx"> ( $value == 1 ) ? do_action( 'mature_blog', $blog_id ) : do_action( 'unmature_blog', $blog_id );
</span><span class="cx"> elseif ( 'archived' == $pref )
</span><span class="cx"> ( $value == 1 ) ? do_action( 'archive_blog', $blog_id ) : do_action( 'unarchive_blog', $blog_id );
</span><del>- elseif ( 'archived' == $pref )
- ( $value == 1 ) ? do_action( 'archive_blog', $blog_id ) : do_action( 'unarchive_blog', $blog_id );
</del><ins>+ elseif ( 'deleted' == $pref )
+ ( $value == 1 ) ? do_action( 'make_delete_blog', $blog_id ) : do_action( 'make_undelete_blog', $blog_id );
</ins><span class="cx">
</span><span class="cx"> return $value;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>