vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-05-20 19:24: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

2
src/wp-admin/network/users.php
View File

@@ -72,7 +72,7 @@ if ( isset( $_GET['action'] ) ) {
$userfunction = 'all_spam';
$blogs = get_blogs_of_user( $user_id, true );
foreach ( (array) $blogs as $details ) {
if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
if ( $details->userblog_id != get_network()->site_id ) // main blog not a spam !
update_blog_status( $details->userblog_id, 'spam', '1' );
}
update_user_status( $user_id, 'spam', '1' );