IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multisite: move get_current_site() to load.php so that it can be used in more places, instead of importing global $current_site.

Browse Source 
See #37699.

Built from https://develop.svn.wordpress.org/trunk@38388


git-svn-id: http://core.svn.wordpress.org/trunk@38329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
2016-08-26 21:35:30 +00:00
parent 35bdc07eac
commit 08233c6aff
7 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/functions.php
View File

@@ -4275,23 +4275,19 @@ 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() )
if ( ! is_multisite() ) {
return true;
}
if ( ! $site_id )
if ( ! $site_id ) {
$site_id = get_current_blog_id();
return (int) $site_id === (int) $current_site->blog_id;
}
return (int) $site_id === (int) get_current_site()->blog_id;
}
/**