Changeset 59738 for trunk

Timestamp:

01/30/2025 11:20:58 AM (21 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp_xmlrpc_server::wp_getUsersBlogs().

Includes a micro-optimization to avoid calling get_current_network_id() in a loop.

Follow-up to [8075], [9798], [26120], [38814].

Props aristath, poena, afercia, SergeyBiryukov.
See #62279.

Location:

trunk/src/wp-includes

Files:

• class-wp-xmlrpc-server.php (modified) (2 diffs)
• ms-functions.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -736 +736 @@
                 do_action( 'xmlrpc_call', 'wp.getUsersBlogs', $args, $this );
 
-                $blogs           = (array) get_blogs_of_user( $user->ID );
-                $struct          = array();
+                $blogs  = (array) get_blogs_of_user( $user->ID );
+                $struct = array();
+
                 $primary_blog_id = 0;
                 $active_blog     = get_active_blog_for_user( $user->ID );
@@ -744 +745 @@
                 }
 
+                $current_network_id = get_current_network_id();
+
                 foreach ( $blogs as $blog ) {
                         // Don't include blogs that aren't hosted at this site.
-                        if ( get_current_network_id() != $blog->site_id ) {
+                        if ( $blog->site_id !== $current_network_id ) {
                                 continue;
                         }

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

@@ -77 +77 @@
                 $blogs = get_blogs_of_user( $user_id, true ); // If a user's primary blog is shut down, check their other blogs.
                 $ret   = false;
+
                 if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
+                        $current_network_id = get_current_network_id();
+
                         foreach ( (array) $blogs as $blog_id => $blog ) {
-                                if ( get_current_network_id() !== $blog->site_id ) {
+                                if ( $blog->site_id !== $current_network_id ) {
                                         continue;
                                 }
@@ -100 +103 @@
                         return;
                 }
+
                 return $ret;
         } else {