<!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>[20522] trunk: Pass full user objects to clean_user_cache().</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/20522">20522</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2012-04-18 21:07:31 +0000 (Wed, 18 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass full user objects to clean_user_cache(). See <a href="http://core.trac.wordpress.org/ticket/19500">#19500</a>, fixes <a href="http://core.trac.wordpress.org/ticket/20460">#20460</a>.
Prevents notices when clean_user_cache() is called for a user that has been removed from the database.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.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 (20521 => 20522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-04-18 20:58:24 UTC (rev 20521)
+++ trunk/wp-admin/includes/ms.php 2012-04-18 21:07:31 UTC (rev 20522)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $id = (int) $id;
</span><ins>+ $user = new WP_User( $id );
</ins><span class="cx">
</span><span class="cx"> do_action( 'wpmu_delete_user', $id );
</span><span class="cx">
</span><span class="lines">@@ -162,7 +163,7 @@
</span><span class="cx"> $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
</span><span class="cx"> $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
</span><span class="cx">
</span><del>- clean_user_cache( $id );
</del><ins>+ clean_user_cache( $user );
</ins><span class="cx">
</span><span class="cx"> // allow for commit transaction
</span><span class="cx"> do_action( 'deleted_user', $id );
</span><span class="lines">@@ -389,7 +390,8 @@
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->users, array( $pref => $value ), array( 'ID' => $id ) );
</span><span class="cx">
</span><del>- clean_user_cache( $id );
</del><ins>+ $user = new WP_User( $id );
+ clean_user_cache( $user );
</ins><span class="cx">
</span><span class="cx"> if ( $pref == 'spam' ) {
</span><span class="cx"> if ( $value == 1 )
</span><span class="lines">@@ -407,7 +409,7 @@
</span><span class="cx"> if ( !$user = get_userdata( $id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- clean_user_cache( $id );
</del><ins>+ clean_user_cache( $user );
</ins><span class="cx">
</span><span class="cx"> return $id;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (20521 => 20522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2012-04-18 20:58:24 UTC (rev 20521)
+++ trunk/wp-admin/includes/user.php 2012-04-18 21:07:31 UTC (rev 20522)
</span><span class="lines">@@ -237,6 +237,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $id = (int) $id;
</span><ins>+ $user = new WP_User( $id );
</ins><span class="cx">
</span><span class="cx"> // allow for transaction statement
</span><span class="cx"> do_action('delete_user', $id);
</span><span class="lines">@@ -262,7 +263,7 @@
</span><span class="cx"> $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- clean_user_cache($id);
</del><ins>+ clean_user_cache( $user );
</ins><span class="cx">
</span><span class="cx"> // FINALLY, delete user
</span><span class="cx"> if ( !is_multisite() ) {
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (20521 => 20522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-04-18 20:58:24 UTC (rev 20521)
+++ trunk/wp-includes/user.php 2012-04-18 21:07:31 UTC (rev 20522)
</span><span class="lines">@@ -1143,15 +1143,21 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $id User ID
</del><ins>+ * @param WP_User $user User object to be cleaned from the cache
</ins><span class="cx"> */
</span><del>-function clean_user_cache($id) {
- $user = WP_User::get_data_by( 'id', $id );
</del><ins>+function clean_user_cache( $user ) {
+ if ( is_numeric( $user ) ) {
+ _deprecated_argument( __FUNCTION__, '3.4', 'Pass the full user object instead of the ID.' );
+ $user = new WP_User( $user );
+ }
</ins><span class="cx">
</span><del>- wp_cache_delete($id, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
- wp_cache_delete($user->user_email, 'useremail');
- wp_cache_delete($user->user_nicename, 'userslugs');
</del><ins>+ if ( ! $user->exists() )
+ return;
+
+ wp_cache_delete( $user->ID, 'users' );
+ wp_cache_delete( $user->user_login, 'userlogins' );
+ wp_cache_delete( $user->user_email, 'useremail' );
+ wp_cache_delete( $user->user_nicename, 'userslugs' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>