vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-06 05:34:26 +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

8
src/wp-includes/load.php
View File

@@ -814,8 +814,6 @@ function get_current_blog_id() {
*
* @since 4.6.0
*
* @global WP_Network $current_site The current network.
*
* @return int The ID of the current network.
*/
function get_current_network_id() {
@@ -823,13 +821,13 @@ function get_current_network_id() {
return 1;
}
$current_site = get_current_site();
$current_network = get_network();
if ( ! isset( $current_site->id ) ) {
if ( ! isset( $current_network->id ) ) {
return get_main_network_id();
}
return absint( $current_site->id );
return absint( $current_network->id );
}
/**