Ticket #36196: 36196.diff

src/wp-admin/includes/class-wp-users-list-table.php

@@ -98 +98 @@
                         $args = array(
                                 'number' => $users_per_page,
                                 'offset' => ( $paged-1 ) * $users_per_page,
-                                'include' => wp_get_users_with_no_role(),
+                                'include' => wp_get_users_with_no_role( $this->site_id ),
                                 'search' => $usersearch,
                                 'fields' => 'all_with_meta'
                         );
@@ -354 +354 @@
                         $post_counts = count_many_users_posts( array_keys( $this->items ) );
 
                 foreach ( $this->items as $userid => $user_object ) {
-                        if ( is_multisite() && empty( $user_object->allcaps ) )
-                                continue;
-
                         echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
                 }
         }

src/wp-includes/user.php

@@ -2406 +2406 @@
 /**
  * Get the user IDs of all users with no role on this site.
  *
- * This function returns an empty array when used on Multisite.
- *
  * @since 4.4.0
+ * @since 4.6.0 The `$site_id` parameter was added to support multisite.
  *
+ * @param int|null $site_id Optional. The site ID to get users with no role for. Defaults to the current site.
+ *
  * @return array Array of user IDs.
  */
-function wp_get_users_with_no_role() {
+function wp_get_users_with_no_role( $site_id = null ) {
         global $wpdb;
 
-        if ( is_multisite() ) {
-                return array();
+        if ( ! $site_id ) {
+                $site_id = get_current_blog_id();
         }
 
-        $prefix = $wpdb->get_blog_prefix();
+        $prefix = $wpdb->get_blog_prefix( $site_id );
         $regex  = implode( '|', wp_roles()->get_names() );
         $regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
         $users  = $wpdb->get_col( $wpdb->prepare( "