WordPress.org

Make WordPress Core

Changeset 37923


Ignore:
Timestamp:
06/29/2016 10:07:17 PM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-site.php

    r37918 r37923  
    2727     *
    2828     * @since 4.5.0
    29      * @since 4.6.0 Converted from public to private to explicitly enable more intuitive
    30      *              access via magic methods.
    31      * @access private
    32      * @var string
    33      */
    34     private $blog_id;
     29     * @access public
     30     * @var string
     31     */
     32    public $blog_id;
    3533
    3634    /**
     
    6159     *
    6260     * @since 4.5.0
    63      * @since 4.6.0 Converted from public to private to explicitly enable more intuitive
    64      *              access via magic methods.
    65      * @access private
    66      * @var string
    67      */
    68     private $site_id = '0';
     61     * @access public
     62     * @var string
     63     */
     64    public $site_id = '0';
    6965
    7066    /**
     
    235231            case 'id':
    236232                return (int) $this->blog_id;
    237             case 'blog_id':
    238                 return $this->blog_id;
    239             case 'site_id':
    240                 return $this->site_id;
    241233            case 'network_id':
    242234                return (int) $this->site_id;
     
    270262        switch ( $key ) {
    271263            case 'id':
    272             case 'blog_id':
    273             case 'site_id':
    274264            case 'network_id':
    275265                return true;
     
    301291        switch ( $key ) {
    302292            case 'id':
    303             case 'blog_id':
    304293                $this->blog_id = (string) $value;
    305294                break;
    306             case 'site_id':
    307295            case 'network_id':
    308296                $this->site_id = (string) $value;
Note: See TracChangeset for help on using the changeset viewer.