<!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>[15833] trunk/wp-includes/user.php:
  Cache invalidation for get_blogs_of_user().</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15833">15833</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-18 17:11:00 +0000 (Mon, 18 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cache invalidation for get_blogs_of_user(). fixes <a href="http://trac.wordpress.org/ticket/14379">#14379</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15832 => 15833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php        2010-10-18 11:44:19 UTC (rev 15832)
+++ trunk/wp-includes/user.php        2010-10-18 17:11:00 UTC (rev 15833)
</span><span class="lines">@@ -575,13 +575,13 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Get the blogs a user belong to.
</del><ins>+ * Get the blogs a user belongs to.
</ins><span class="cx">  *
</span><del>- * $since 3.0.0
</del><ins>+ * @since 3.0.0
</ins><span class="cx">  *
</span><span class="cx">  * @param int $id User Id
</span><del>- * @param bool $all Whether to retrieve all blog details or an abbreviated set of details. Default is abbreviated.
- * @return array A list of the user's blogs.
</del><ins>+ * @param bool $all Whether to retrieve all blogs or only blogs that are not marked as deleted, archived, or spam.
+ * @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.
</ins><span class="cx">  */
</span><span class="cx"> function get_blogs_of_user( $id, $all = false ) {
</span><span class="cx">         global $wpdb;
</span><span class="lines">@@ -598,41 +598,43 @@
</span><span class="cx">                 return $blogs;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        $cache_suffix = $all ? '_all' : '_short';
-        $return = wp_cache_get( 'blogs_of_user_' . $id . $cache_suffix, 'users' );
-        if ( $return )
-                return apply_filters( 'get_blogs_of_user', $return, $id, $all );
</del><ins>+        $blogs = wp_cache_get( 'blogs_of_user-' . $id, 'users' );
+        if ( false === $blogs ) {
+                $user = get_userdata( (int) $id );
+                if ( !$user )
+                        return false;
</ins><span class="cx"> 
</span><del>-        $user = get_userdata( (int) $id );
-        if ( !$user )
-                return false;
-
-        $blogs = $match = array();
-        $prefix_length = strlen($wpdb-&gt;base_prefix);
-        foreach ( (array) $user as $key =&gt; $value ) {
-                if ( $prefix_length &amp;&amp; substr($key, 0, $prefix_length) != $wpdb-&gt;base_prefix )
-                        continue;
-                if ( substr($key, -12, 12) != 'capabilities' )
-                        continue;
-                if ( preg_match( '/^' . $wpdb-&gt;base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
-                        if ( count( $match ) &gt; 2 )
-                                $blog_id = $match[ 2 ];
-                        else
-                                $blog_id = 1;
-                        $blog = get_blog_details( $blog_id );
-                        if ( $blog &amp;&amp; isset( $blog-&gt;domain ) &amp;&amp; ( $all == true || $all == false &amp;&amp; ( $blog-&gt;archived == 0 &amp;&amp; $blog-&gt;spam == 0 &amp;&amp; $blog-&gt;deleted == 0 ) ) ) {
-                                $blogs[ $blog_id ]-&gt;userblog_id        = $blog_id;
-                                $blogs[ $blog_id ]-&gt;blogname                = $blog-&gt;blogname;
-                                $blogs[ $blog_id ]-&gt;domain                = $blog-&gt;domain;
-                                $blogs[ $blog_id ]-&gt;path                        = $blog-&gt;path;
-                                $blogs[ $blog_id ]-&gt;site_id                = $blog-&gt;site_id;
-                                $blogs[ $blog_id ]-&gt;siteurl                = $blog-&gt;siteurl;
</del><ins>+                $blogs = $match = array();
+                $prefix_length = strlen($wpdb-&gt;base_prefix);
+                foreach ( (array) $user as $key =&gt; $value ) {
+                        if ( $prefix_length &amp;&amp; substr($key, 0, $prefix_length) != $wpdb-&gt;base_prefix )
+                                continue;
+                        if ( substr($key, -12, 12) != 'capabilities' )
+                                continue;
+                        if ( preg_match( '/^' . $wpdb-&gt;base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
+                                if ( count( $match ) &gt; 2 )
+                                        $blogs[] = (int) $match[ 2 ];
+                                else
+                                        $blogs[] = 1;
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><ins>+                wp_cache_set( 'blogs_of_user-' . $id, $blogs, 'users' );
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        wp_cache_add( 'blogs_of_user_' . $id . $cache_suffix, $blogs, 'users', 5 );
-        return apply_filters( 'get_blogs_of_user', $blogs, $id, $all );
</del><ins>+        $blog_deets = array();
+        foreach ( (array) $blogs as $blog_id ) {
+                $blog = get_blog_details( $blog_id );
+                if ( $blog &amp;&amp; isset( $blog-&gt;domain ) &amp;&amp; ( $all == true || $all == false &amp;&amp; ( $blog-&gt;archived == 0 &amp;&amp; $blog-&gt;spam == 0 &amp;&amp; $blog-&gt;deleted == 0 ) ) ) {
+                        $blog_deets[ $blog_id ]-&gt;userblog_id        = $blog_id;
+                        $blog_deets[ $blog_id ]-&gt;blogname                = $blog-&gt;blogname;
+                        $blog_deets[ $blog_id ]-&gt;domain                = $blog-&gt;domain;
+                        $blog_deets[ $blog_id ]-&gt;path                        = $blog-&gt;path;
+                        $blog_deets[ $blog_id ]-&gt;site_id                = $blog-&gt;site_id;
+                        $blog_deets[ $blog_id ]-&gt;siteurl                = $blog-&gt;siteurl;
+                }
+        }
+
+        return apply_filters( 'get_blogs_of_user', $blog_deets, $id, $all );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function get_ordered_blogs_of_user( $user_id, $visibility = true ) {
</span><span class="lines">@@ -1268,6 +1270,7 @@
</span><span class="cx">         wp_cache_delete($user-&gt;user_login, 'userlogins');
</span><span class="cx">         wp_cache_delete($user-&gt;user_email, 'useremail');
</span><span class="cx">         wp_cache_delete($user-&gt;user_nicename, 'userslugs');
</span><ins>+        wp_cache_delete('blogs_of_user-' . $id, 'users');
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ?&gt;
</span></span></pre>
</div>
</div>

</body>
</html>