Ticket #40511: 40511.diff

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

@@ -233 +233 @@
         public function __get( $key ) {
                 switch ( $key ) {
                         case 'id':
+                        case 'userblog_id':
                                 return (int) $this->blog_id;
                         case 'network_id':
                                 return (int) $this->site_id;
@@ -270 +271 @@
                 switch ( $key ) {
                         case 'id':
                         case 'network_id':
+                        case 'userblog_id':
                                 return true;
                         case 'blogname':
                         case 'siteurl':
@@ -307 +309 @@
         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

@@ -656 +656 @@
                 $_sites = get_sites( $args );
 
                 foreach ( $_sites as $site ) {
-                        $sites[ $site->id ] = (object) array(
-                                'userblog_id' => $site->id,
-                                'blogname'    => $site->blogname,
-                                'domain'      => $site->domain,
-                                'path'        => $site->path,
-                                'site_id'     => $site->network_id,
-                                'siteurl'     => $site->siteurl,
-                                'archived'    => $site->archived,
-                                'mature'      => $site->mature,
-                                'spam'        => $site->spam,
-                                'deleted'     => $site->deleted,
-                        );
+                        $sites[ $site->id ] = $site;
                 }
         }