vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-11 16:14:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Use get_network() and get_current_network_id() for current network data.

Browse Source 
`get_network()` falls back to the current network when called without any arguments. Between this and `get_current_network_id()`, we can replace almost all instances of the global `$current_site` and all instances of `get_current_site()`.

This effectively deprecates `get_current_site()`, something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.


git-svn-id: https://develop.svn.wordpress.org/trunk@38814 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2016-10-19 04:46:14 +00:00
parent 8a79cdc107
commit 2979167ba7
25 changed files with 101 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wp-includes/functions.php
View File

@@ -4302,23 +4302,18 @@ function wp_suspend_cache_invalidation( $suspend = true ) {
*
* @since 3.0.0
*
* @global object $current_site
*
* @param int $site_id Optional. Site ID to test. Defaults to current site.
* @return bool True if $site_id is the main site of the network, or if not
* running Multisite.
*/
function is_main_site( $site_id = null ) {
// This is the current network's information; 'site' is old terminology.
global $current_site;
if ( ! is_multisite() )
return true;
if ( ! $site_id )
$site_id = get_current_blog_id();
return (int) $site_id === (int) $current_site->blog_id;
return (int) $site_id === (int) get_network()->site_id;
}
/**
@@ -4334,10 +4329,8 @@ function is_main_network( $network_id = null ) {
return true;
}
$current_network_id = (int) get_current_site()->id;
if ( null === $network_id ) {
$network_id = $current_network_id;
$network_id = get_current_network_id();
}
$network_id = (int) $network_id;
@@ -4357,11 +4350,11 @@ function get_main_network_id() {
return 1;
}
$current_site = get_current_site();
$current_network = get_network();
if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
$main_network_id = PRIMARY_NETWORK_ID;
} elseif ( isset( $current_site->id ) && 1 === (int) $current_site->id ) {
} elseif ( isset( $current_network->id ) && 1 === (int) $current_network->id ) {
// If the current network has an ID of 1, assume it is the main network.
$main_network_id = 1;
} else {