Ticket #37050: 37050.3.diff
File 37050.3.diff, 1.9 KB (added by , 9 years ago) |
---|
-
src/wp-includes/class-wp-network.php
18 18 * 19 19 * @since 4.4.0 20 20 * 21 * @property int $id 21 22 * @property int $site_id 22 23 */ 23 24 class WP_Network { … … 25 26 /** 26 27 * Network ID. 27 28 * 28 * A numeric string, for compatibility reasons.29 *30 29 * @since 4.4.0 31 * @access public 32 * @var string 30 * @since 4.6.0 Type changed from string to int. 31 * @access private 32 * @var int 33 33 */ 34 p ublic$id;34 private $id; 35 35 36 36 /** 37 37 * Domain of the network. … … 63 63 * @access private 64 64 * @var string 65 65 */ 66 private $blog_id = 0;66 private $blog_id = '0'; 67 67 68 68 /** 69 69 * Domain used to set cookies for this network. … … 152 152 */ 153 153 public function __get( $key ) { 154 154 switch ( $key ) { 155 case 'id'; 156 return (int) $this->id; 155 157 case 'blog_id': 156 158 return $this->blog_id; 157 159 case 'site_id': … … 174 176 */ 175 177 public function __isset( $key ) { 176 178 switch ( $key ) { 179 case 'id': 177 180 case 'blog_id': 178 181 case 'site_id': 179 182 return true; … … 195 198 */ 196 199 public function __set( $key, $value ) { 197 200 switch ( $key ) { 201 case 'id': 202 $this->id = (int) $value; 203 break; 198 204 case 'blog_id': 199 205 case 'site_id': 200 206 $this->blog_id = (string) $value; -
tests/phpunit/tests/multisite/network.php
88 88 } 89 89 90 90 /** 91 * @ticket 37050 92 */ 93 function test_is_network_id_int() { 94 $id = self::factory()->network->create(); 95 96 $network = WP_Network::get_instance( $id ); 97 98 $this->assertSame( (int) $id, $network->id ); 99 } 100 101 /** 91 102 * @ticket 22917 92 103 */ 93 104 public function test_get_blog_count_no_filter_applied() {