IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests 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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt
2016-10-19 04:47:30 +00:00
parent 1c3b96537f
commit 1560fbcbc5
26 changed files with 102 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/ms-default-constants.php
View File

@@ -47,19 +47,19 @@ function ms_upload_constants() {
* @since 3.0.0
*/
function ms_cookie_constants( ) {
$current_site = get_current_site();
$current_network = get_network();
/**
* @since 1.2.0
*/
if ( !defined( 'COOKIEPATH' ) )
define( 'COOKIEPATH', $current_site->path );
define( 'COOKIEPATH', $current_network->path );
/**
* @since 1.5.0
*/
if ( !defined( 'SITECOOKIEPATH' ) )
define( 'SITECOOKIEPATH', $current_site->path );
define( 'SITECOOKIEPATH', $current_network->path );
/**
* @since 2.6.0
@@ -76,10 +76,10 @@ function ms_cookie_constants( ) {
* @since 2.0.0
*/
if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
if ( !empty( $current_site->cookie_domain ) )
define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
if ( !empty( $current_network->cookie_domain ) )
define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
else
define('COOKIE_DOMAIN', '.' . $current_site->domain);
define('COOKIE_DOMAIN', '.' . $current_network->domain);
}
}