Changeset 38814 for trunk/src/wp-admin/includes/ms.php

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

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

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.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ms.php

@@ -89 +89 @@
     update_blog_status( $blog_id, 'deleted', 1 );
 
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     // If a full blog object is not available, do not destroy anything.
@@ -97 +97 @@
 
     // Don't destroy the initial, main, or root blog.
-    if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
+    if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_network->path && $blog->domain == $current_network->domain ) ) ) {
         $drop = false;
     }