vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 21:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Introduce get_main_site_id().

Browse Source 
This function can be used to easily get the main site ID of a given network via the optional `$network_id` parameter, which defaults to the current network. The existing `is_main_site()` now uses the new function internally and now accepts an optional `$network_id` parameter as well.

The main purpose of the new function at this point is to ensure that the `WP_Network::$blog_id` property is always set. Magic getters in the class have been adjusted to auto-fill the property when it is accessed and empty. Furthermore the function encapsulates logic that was previously part of `ms_load_current_site_and_network()` and has been replaced with a call to the function now.

Props spacedmonkey, jeremyfelt, johnjamesjacoby, flixos90.
Fixes #29684.


git-svn-id: https://develop.svn.wordpress.org/trunk@41380 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2017-09-15 11:14:49 +00:00
parent 95a2632121
commit e23004c344
6 changed files with 249 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/multisite/getMainSiteId.php
+110
View File
@@ -0,0 +1,110 @@
<?php
if ( is_multisite() ) :
/**
* Tests for the get_main_site_id() function.
*
* @group ms-site
* @group multisite
*/
class Tests_Multisite_Get_Main_Site_ID extends WP_UnitTestCase {
protected static $network_ids;
protected static $site_ids;
public static function wpSetUpBeforeClass( $factory ) {
self::$network_ids = array(
'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/' ),
'wp.org/' => array( 'domain' => 'wp.org', 'path' => '/' ), // A network with no sites.
);
foreach ( self::$network_ids as &$id ) {
$id = $factory->network->create( $id );
}
unset( $id );
self::$site_ids = array(
'www.w.org/' => array( 'domain' => 'www.w.org', 'path' => '/' ),
'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['wordpress.org/'] ),
'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'site_id' => self::$network_ids['wordpress.org/'] ),
);
foreach ( self::$site_ids as &$id ) {
$id = $factory->blog->create( $id );
}
unset( $id );
}
public static function wpTearDownAfterClass() {
foreach( self::$site_ids as $id ) {
wpmu_delete_blog( $id, true );
}
global $wpdb;
foreach( self::$network_ids as $id ) {
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
}
wp_update_network_site_counts();
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_on_main_site_returns_self() {
$this->assertSame( get_current_blog_id(), get_main_site_id() );
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_returns_main_site_in_switched_context() {
$main_site_id = get_current_blog_id();
$other_site_id = self::$site_ids['www.w.org/'];
switch_to_blog( $other_site_id );
$result = get_main_site_id();
restore_current_blog();
$this->assertSame( $main_site_id, $result );
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_with_different_network_returns_correct_id() {
$this->assertSame( self::$site_ids['wordpress.org/'], get_main_site_id( self::$network_ids['wordpress.org/'] ) );
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_on_network_without_site_returns_0() {
$this->assertSame( 0, get_main_site_id( self::$network_ids['wp.org/'] ) );
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_on_invalid_network_returns_0() {
$this->assertSame( 0, get_main_site_id( 333 ) );
}
/**
* @ticket 29684
*/
public function test_get_main_site_id_filtered() {
add_filter( 'pre_get_main_site_id', array( $this, 'filter_get_main_site_id' ) );
$result = get_main_site_id();
$this->assertSame( 333, $result );
}
public function filter_get_main_site_id() {
return 333;
}
}
endif;
tests/phpunit/tests/multisite/network.php
+9
View File
@@ -583,6 +583,15 @@ class Tests_Multisite_Network extends WP_UnitTestCase {
$this->assertEquals( $original_count + 1, $result );
}
/**
* @ticket 29684
*/
public function test_network_blog_id_set() {
$network = get_network( self::$different_network_id );
$this->assertSame( (string) self::$different_site_ids[0], $network->blog_id );
}
}
endif;
tests/phpunit/tests/multisite/site.php
+29
View File
@@ -11,6 +11,7 @@ if ( is_multisite() ) :
class Tests_Multisite_Site extends WP_UnitTestCase {
protected $suppress = false;
protected static $network_ids;
protected static $site_ids;
function setUp() {
global $wpdb;
@@ -33,11 +34,25 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
$id = $factory->network->create( $id );
}
unset( $id );
self::$site_ids = array(
'make.wordpress.org/' => array( 'domain' => 'make.wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['make.wordpress.org/'] ),
'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/', 'site_id' => self::$network_ids['make.wordpress.org/'] ),
);
foreach ( self::$site_ids as &$id ) {
$id = $factory->blog->create( $id );
}
unset( $id );
}
public static function wpTearDownAfterClass() {
global $wpdb;
foreach( self::$site_ids as $id ) {
wpmu_delete_blog( $id, true );
}
foreach( self::$network_ids as $id ) {
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
@@ -1028,6 +1043,20 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
function filter_allow_unavailable_languages( $value, $option, $original_value ) {
return $original_value;
}
/**
* @ticket 29684
*/
public function test_is_main_site_different_network() {
$this->assertTrue( is_main_site( self::$site_ids['make.wordpress.org/'], self::$network_ids['make.wordpress.org/'] ) );
}
/**
* @ticket 29684
*/
public function test_is_main_site_different_network_random_site() {
$this->assertFalse( is_main_site( self::$site_ids['make.wordpress.org/foo/'], self::$network_ids['make.wordpress.org/'] ) );
}
}
endif;