Ticket #37061: 37061.diff

src/wp-includes/class-wp-site.php

@@ -17 +17 @@
  *
  * @property int $id
  * @property int $network_id
+ * @property int $userblog_id
  */
 final class WP_Site {
 
@@ -229 +230 @@
         public function __get( $key ) {
                 switch ( $key ) {
                         case 'id':
+                        case 'userblog_id':
                                 return (int) $this->blog_id;
                         case 'network_id':
                                 return (int) $this->site_id;
@@ -261 +263 @@
         public function __isset( $key ) {
                 switch ( $key ) {
                         case 'id':
+                        case 'userblog_id':
                         case 'network_id':
                                 return true;
                         case 'blogname':
@@ -290 +293 @@
         public function __set( $key, $value ) {
                 switch ( $key ) {
                         case 'id':
+                        case 'userblog_id':
                                 $this->blog_id = (string) $value;
                                 break;
                         case 'network_id':

src/wp-includes/user.php

@@ -618 +618 @@
                 return $blogs;
         }
 
-        $blogs = array();
+        $site_ids = array();
 
         if ( isset( $keys[ $wpdb->base_prefix . 'capabilities' ] ) && defined( 'MULTISITE' ) ) {
-                $blog = get_blog_details( 1 );
-                if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-                        $blogs[ 1 ] = (object) array(
-                                'userblog_id' => 1,
-                                'blogname'    => $blog->blogname,
-                                'domain'      => $blog->domain,
-                                'path'        => $blog->path,
-                                'site_id'     => $blog->site_id,
-                                'siteurl'     => $blog->siteurl,
-                                'archived'    => $blog->archived,
-                                'mature'      => $blog->mature,
-                                'spam'        => $blog->spam,
-                                'deleted'     => $blog->deleted,
-                        );
-                }
+                $site_ids[] = 1;
                 unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
         }
 
@@ -650 +636 @@
                 if ( ! is_numeric( $blog_id ) )
                         continue;
 
-                $blog_id = (int) $blog_id;
-                $blog = get_blog_details( $blog_id );
-                if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-                        $blogs[ $blog_id ] = (object) array(
-                                'userblog_id' => $blog_id,
-                                'blogname'    => $blog->blogname,
-                                'domain'      => $blog->domain,
-                                'path'        => $blog->path,
-                                'site_id'     => $blog->site_id,
-                                'siteurl'     => $blog->siteurl,
-                                'archived'    => $blog->archived,
-                                'mature'      => $blog->mature,
-                                'spam'        => $blog->spam,
-                                'deleted'     => $blog->deleted,
-                        );
-                }
+                $site_ids[] = (int) $blog_id;
         }
 
+        $args = array(
+                'number' => '',
+                'site__in' => $site_ids,
+        );
+        if ( ! $all ) {
+                $args['archived'] = 0;
+                $args['spam']     = 0;
+                $args['deleted']  = 0;
+        }
+
+        $_sites = get_sites( $args );
+
+        $sites = array();
+        foreach ( $_sites as $site ) {
+                $sites[ $site->id ] = $site;
+        }
+
         /**
-         * Filters the list of blogs a user belongs to.
+         * Filters the list of sites a user belongs to.
          *
          * @since MU
          *
-         * @param array $blogs   An array of blog objects belonging to the user.
+         * @param array $sites   An array of site objects belonging to the user.
          * @param int   $user_id User ID.
-         * @param bool  $all     Whether the returned blogs array should contain all blogs, including
+         * @param bool  $all     Whether the returned sites array should contain all sites, including
          *                       those marked 'deleted', 'archived', or 'spam'. Default false.
          */
-        return apply_filters( 'get_blogs_of_user', $blogs, $user_id, $all );
+        return apply_filters( 'get_blogs_of_user', $sites, $user_id, $all );
 }
 
 /**