Changeset 38814 for trunk/src/wp-admin/network/sites.php

Timestamp:

10/19/2016 04:46:14 AM (10 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/network/sites.php (modified) (3 diffs)

trunk/src/wp-admin/network/sites.php

@@ -88 +88 @@
                 }
 
-                if ( $current_site->blog_id == $id ) {
+                if ( get_network()->site_id == $id ) {
                         wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
                 }
@@ -127 +127 @@
 
                         $updated_action = 'not_deleted';
-                        if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
+                        if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
                                 wpmu_delete_blog( $id, true );
                                 $updated_action = 'delete';
@@ -138 +138 @@
 
                                 foreach ( (array) $_POST['allblogs'] as $key => $val ) {
-                                        if ( $val != '0' && $val != $current_site->blog_id ) {
+                                        if ( $val != '0' && $val != get_network()->site_id ) {
                                                 switch ( $doaction ) {
                                                         case 'delete':