Ticket #15458: 15458.8.diff

wp-includes/user.php

@@ -665 +665 @@
         }
 
         // Logged out users can't have blogs
-        if ( 0 === $id )
+        if ( empty( $id ) )
                 return false;
 
-        $blogs = wp_cache_get( 'blogs_of_user-' . $id, 'users' );
+        $userkeys = get_user_meta( (int) $id );
+        if ( empty( $userkeys ) )
+                return false;
+        $userkeys = array_keys( $userkeys );
 
-        // Try priming the new cache from the old cache
-        if ( false === $blogs ) {
-                $cache_suffix = $all ? '_all' : '_short';
-                $blogs = wp_cache_get( 'blogs_of_user_' . $id . $cache_suffix, 'users' );
-                if ( is_array( $blogs ) ) {
-                        $blogs = array_keys( $blogs );
-                        if ( $all )
-                                wp_cache_set( 'blogs_of_user-' . $id, $blogs, 'users' );
+        $blogs = array();
+        foreach ( $userkeys as $key ) {
+                if ( $key === $wpdb->base_prefix . 'capabilities' ) {
+                        $blogs[] = 1;
+                        continue;
                 }
+                if ( 'capabilities' !== substr( $key, -12 ) )
+                        continue;
+                if ( 0 !== strpos( $key, $wpdb->base_prefix ) )
+                        continue;
+                $key = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
+                if ( is_numeric( $key ) )
+                        $blogs[] = (int) $key;
         }
 
-        if ( false === $blogs ) {
-                $userkeys = get_user_meta( (int) $id );
-                if ( empty( $userkeys ) )
-                        return false;
-                $userkeys = array_keys( $userkeys );
-
-                $blogs = $match = array();
-                $prefix_length = strlen( $wpdb->base_prefix );
-                foreach ( $userkeys as $key ) {
-                        if ( $prefix_length && substr($key, 0, $prefix_length) != $wpdb->base_prefix )
-                                continue;
-                        if ( substr($key, -12, 12) != 'capabilities' )
-                                continue;
-                        if ( preg_match( '/^' . $wpdb->base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
-                                if ( count( $match ) > 2 )
-                                        $blogs[] = (int) $match[ 2 ];
-                                else
-                                        $blogs[] = 1;
-                        }
-                }
-                wp_cache_set( 'blogs_of_user-' . $id, $blogs, 'users' );
-        }
-
         $blog_deets = array();
         foreach ( (array) $blogs as $blog_id ) {
                 $blog = get_blog_details( $blog_id );
@@ -1153 +1137 @@
         wp_cache_delete($user->user_login, 'userlogins');
         wp_cache_delete($user->user_email, 'useremail');
         wp_cache_delete($user->user_nicename, 'userslugs');
-        wp_cache_delete('blogs_of_user-' . $id, 'users');
 }
 
 /**