Changeset 37923 for trunk/src/wp-includes/class-wp-site.php

Timestamp:

06/29/2016 10:07:17 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Revert property type changes in WP_Site.

Partial revert of [37657]. Moving existing properties in WP_Site from public to private broke backwards compatibility in a pretty severe way. We made an initial attempt to work around this, but due to the variety of possible issues, moving forward does not seem wise.

Fixes #36717.

File:

• trunk/src/wp-includes/class-wp-site.php (modified) (5 diffs)

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

@@ -27 +27 @@
      *
      * @since 4.5.0
-     * @since 4.6.0 Converted from public to private to explicitly enable more intuitive
-     *              access via magic methods.
-     * @access private
-     * @var string
-     */
-    private $blog_id;
+     * @access public
+     * @var string
+     */
+    public $blog_id;
 
     /**
@@ -61 +59 @@
      *
      * @since 4.5.0
-     * @since 4.6.0 Converted from public to private to explicitly enable more intuitive
-     *              access via magic methods.
-     * @access private
-     * @var string
-     */
-    private $site_id = '0';
+     * @access public
+     * @var string
+     */
+    public $site_id = '0';
 
     /**
@@ -235 +231 @@
             case 'id':
                 return (int) $this->blog_id;
-            case 'blog_id':
-                return $this->blog_id;
-            case 'site_id':
-                return $this->site_id;
             case 'network_id':
                 return (int) $this->site_id;
@@ -270 +262 @@
         switch ( $key ) {
             case 'id':
-            case 'blog_id':
-            case 'site_id':
             case 'network_id':
                 return true;
@@ -301 +291 @@
         switch ( $key ) {
             case 'id':
-            case 'blog_id':
                 $this->blog_id = (string) $value;
                 break;
-            case 'site_id':
             case 'network_id':
                 $this->site_id = (string) $value;