Changeset 55672

Timestamp:

04/21/2023 09:48:41 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Networks and Sites: Use is_main_site() in a few more places.

This updates some more instances of comparing site IDs on Sites and Users screens in network admin to use is_main_site() for clarity.

Follow-up to [12603], [13918], [22064], [38814], [41131], [55666].

See #58150.

Location:

trunk/src/wp-admin/network

Files:

• sites.php (modified) (4 diffs)
• users.php (modified) (1 diff)

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

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

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

@@ -95 +95 @@
 
                                                                 foreach ( (array) $blogs as $details ) {
-                                                                        if ( get_network()->site_id != $details->userblog_id ) { // Main blog is not a spam!
+                                                                        if ( ! is_main_site( $details->userblog_id ) ) { // Main site is not a spam!
                                                                                 update_blog_status( $details->userblog_id, 'spam', '1' );
                                                                         }