<!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>[20581] trunk: * Return empty arrays instead of false for all conditions in get_blogs_of_user().</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/20581">20581</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-24 22:13:47 +0000 (Tue, 24 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Return empty arrays instead of false for all conditions in get_blogs_of_user().
* When deleting a user, use a delete_metadata_by_mid() loop over the meta so that the meta cache is cleared.
* Use remove_user_from_blog() for DRYness.
Props nacin, duck_
Fixes <a href="http://core.trac.wordpress.org/ticket/19500">#19500</a></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 (20580 => 20581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-04-24 22:06:55 UTC (rev 20580)
+++ trunk/wp-admin/includes/ms.php 2012-04-24 22:13:47 UTC (rev 20581)
</span><span class="lines">@@ -160,7 +160,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
</del><ins>+ $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+ foreach ( $meta as $mid )
+ delete_metadata_by_mid( 'user', $mid );
+
</ins><span class="cx"> $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
</span><span class="cx">
</span><span class="cx"> clean_user_cache( $user );
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (20580 => 20581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2012-04-24 22:06:55 UTC (rev 20580)
+++ trunk/wp-admin/includes/user.php 2012-04-24 22:13:47 UTC (rev 20581)
</span><span class="lines">@@ -264,12 +264,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FINALLY, delete user
</span><del>- if ( !is_multisite() ) {
- $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id ) );
</del><ins>+ if ( is_multisite() ) {
+ remove_user_from_blog( $id, get_current_blog_id() );
+ } else {
+ $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+ foreach ( $meta as $mid )
+ delete_metadata_by_mid( 'user', $mid );
+
</ins><span class="cx"> $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
</span><del>- } else {
- $level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
- $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $id , 'meta_key' => $level_key ) );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clean_user_cache( $user );
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (20580 => 20581)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-04-24 22:06:55 UTC (rev 20580)
+++ trunk/wp-includes/user.php 2012-04-24 22:13:47 UTC (rev 20581)
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id User ID
</span><span class="cx"> * @param bool $all Whether to retrieve all blogs, or only blogs that are not marked as deleted, archived, or spam.
</span><del>- * @return array A list of the user's blogs. False if the user was not found or an empty array if the user has no blogs.
</del><ins>+ * @return array A list of the user's blogs. An empty array if the user doesn't exist or belongs to no blogs.
</ins><span class="cx"> */
</span><span class="cx"> function get_blogs_of_user( $user_id, $all = false ) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -661,11 +661,11 @@
</span><span class="cx">
</span><span class="cx"> // Logged out users can't have blogs
</span><span class="cx"> if ( empty( $user_id ) )
</span><del>- return false;
</del><ins>+ return array();
</ins><span class="cx">
</span><span class="cx"> $keys = get_user_meta( $user_id );
</span><span class="cx"> if ( empty( $keys ) )
</span><del>- return false;
</del><ins>+ return array();
</ins><span class="cx">
</span><span class="cx"> if ( ! is_multisite() ) {
</span><span class="cx"> $blog_id = get_current_blog_id();
</span><span class="lines">@@ -745,10 +745,7 @@
</span><span class="cx"> $blog_id = get_current_blog_id();
</span><span class="cx">
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id );
</span><del>- if ( is_array( $blogs ) )
- return array_key_exists( $blog_id, $blogs );
- else
- return false;
</del><ins>+ return array_key_exists( $blog_id, $blogs );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>