Ticket #38630: 38630.diff

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

@@ -15 +15 @@
  *
  * @since 4.5.0
  *
- * @property int    $id
- * @property int    $network_id
  * @property string $blogname
  * @property string $siteurl
  * @property int    $post_count
@@ -27 +25 @@
         /**
          * Site ID.
          *
-         * A numeric string, for compatibility reasons.
-         *
-         * @since 4.5.0
+         * @since 4.8.0
          * @access public
-         * @var string
+         * @var int
          */
-        public $blog_id;
+        public $id;
 
         /**
          * Domain of the site.
@@ -56 +52 @@
         /**
          * The ID of the site's parent network.
          *
-         * Named "site" vs. "network" for legacy reasons. An individual site's "site" is
-         * its network.
-         *
-         * A numeric string, for compatibility reasons.
-         *
-         * @since 4.5.0
+         * @since 4.8.0
          * @access public
-         * @var string
+         * @var int
          */
-        public $site_id = '0';
+        public $network_id = 0;
 
         /**
          * The date on which the site was created or registered.
@@ -202 +193 @@
          */
         public function __construct( $site ) {
                 foreach( get_object_vars( $site ) as $key => $value ) {
-                        $this->$key = $value;
+                        $this->__set( $key, $value );
                 }
         }
 
@@ -233 +224 @@
         public function __get( $key ) {
                 switch ( $key ) {
                         case 'id':
-                                return (int) $this->blog_id;
+                                return (int) $this->id;
                         case 'network_id':
-                                return (int) $this->site_id;
+                                return (int) $this->network_id;
                         case 'blogname':
                         case 'siteurl':
                         case 'post_count':
@@ -245 +236 @@
                                 }
                                 $details = $this->get_details();
                                 return $details->$key;
+
+                        // Support blog_id for legacy reasons.
+                        case 'blog_id':
+                                return (string) $this->id;
+
+                        // Support site_id for legacy reasons.
+                        case 'site_id':
+                                return (string) $this->network_id;
                 }
 
                 return null;
@@ -275 +274 @@
                                         return false;
                                 }
                                 return true;
+
+                        // Support blog_id and site_id for legacy reasons.
+                        case 'blog_id':
+                        case 'site_id':
+                                return true;
                 }
 
                 return false;
@@ -293 +297 @@
          */
         public function __set( $key, $value ) {
                 switch ( $key ) {
+                        // Support blog_id for legacy reasons.
+                        case 'blog_id':
                         case 'id':
-                                $this->blog_id = (string) $value;
+                                $this->id = (int) $value;
                                 break;
+
+                        // Support site_id for legacy reasons.
+                        case 'site_id':
                         case 'network_id':
-                                $this->site_id = (string) $value;
+                                $this->network_id = (int) $value;
                                 break;
                         default:
                                 $this->$key = $value;