<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16673] trunk: Deprecate and ignore the refresh arg.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16673">16673</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-01 22:12:09 +0000 (Wed, 01 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecate and ignore the refresh arg. fixes <a href="http://trac.wordpress.org/ticket/15605">#15605</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesmsblogsphp">trunk/wp-includes/ms-blogs.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 (16672 => 16673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-12-01 21:32:40 UTC (rev 16672)
+++ trunk/wp-admin/includes/ms.php 2010-12-01 22:12:09 UTC (rev 16673)
</span><span class="lines">@@ -432,13 +432,15 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wpmueditblogaction', 'upload_space_setting' );
</span><span class="cx">
</span><del>-function update_user_status( $id, $pref, $value, $refresh = 1 ) {
</del><ins>+function update_user_status( $id, $pref, $value, $deprecated = null ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ if ( null !== $deprecated )
+ _deprecated_argument( __FUNCTION__, '3.1.0' );
+
</ins><span class="cx"> $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
</span><span class="cx">
</span><del>- if ( $refresh == 1 )
- refresh_user_details( $id );
</del><ins>+ clean_user_cache( $id );
</ins><span class="cx">
</span><span class="cx"> if ( $pref == 'spam' ) {
</span><span class="cx"> if ( $value == 1 )
</span></span></pre></div>
<a id="trunkwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-blogs.php (16672 => 16673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-blogs.php 2010-12-01 21:32:40 UTC (rev 16672)
+++ trunk/wp-includes/ms-blogs.php 2010-12-01 22:12:09 UTC (rev 16673)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($details[ 'public' ]) )
</span><del>- update_blog_option( $blog_id, 'blog_public', $details[ 'public' ], false );
</del><ins>+ update_blog_option( $blog_id, 'blog_public', $details[ 'public' ] );
</ins><span class="cx">
</span><span class="cx"> refresh_blog_details($blog_id);
</span><span class="cx">
</span><span class="lines">@@ -421,17 +421,19 @@
</span><span class="cx"> * @param int $id The blog id
</span><span class="cx"> * @param string $key The option key
</span><span class="cx"> * @param mixed $value The option value
</span><del>- * @param bool $refresh Whether to refresh blog details or not
</del><span class="cx"> */
</span><del>-function update_blog_option( $id, $key, $value, $refresh = true ) {
</del><ins>+function update_blog_option( $id, $key, $value, $deprecated = null ) {
</ins><span class="cx"> $id = (int) $id;
</span><span class="cx">
</span><ins>+ if ( null !== $deprecated )
+ _deprecated_argument( __FUNCTION__, '3.1.0' );
+
</ins><span class="cx"> switch_to_blog($id);
</span><span class="cx"> update_option( $key, $value );
</span><span class="cx"> restore_current_blog();
</span><span class="cx">
</span><del>- if ( $refresh == true )
- refresh_blog_details( $id );
</del><ins>+ refresh_blog_details( $id );
+
</ins><span class="cx"> wp_cache_set( $id."-".$key."-blog_option", $value, 'site-options');
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -614,19 +616,20 @@
</span><span class="cx"> * @param int $blog_id BLog ID
</span><span class="cx"> * @param string $pref A field name
</span><span class="cx"> * @param string $value Value for $pref
</span><del>- * @param bool $refresh Whether to refresh the blog details cache. Default is true.
</del><span class="cx"> * @return string $value
</span><span class="cx"> */
</span><del>-function update_blog_status( $blog_id, $pref, $value, $refresh = true ) {
</del><ins>+function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><ins>+ if ( null !== $deprecated )
+ _deprecated_argument( __FUNCTION__, '3.1.0' );
+
</ins><span class="cx"> if ( !in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
</span><span class="cx"> return $value;
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
</span><span class="cx">
</span><del>- if ( $refresh )
- refresh_blog_details($blog_id);
</del><ins>+ refresh_blog_details($blog_id);
</ins><span class="cx">
</span><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></pre>
</div>
</div>
</body>
</html>