Changeset 41138 for trunk/src/wp-admin/includes/class-wp-users-list-table.php

Timestamp:

07/25/2017 12:23:44 AM (8 years ago)

Author:

johnbillion

Message:

Users: Ensure that users with no role on a site are taken into consideration when listing users on Multisite.

This ensures that users who are a member of a site but have no role are correctly listed on the Users screen and can be filtered from the 'None' role filter.

Props tobi823, flixos90, scottlee

Fixes #36196

File:

• trunk/src/wp-admin/includes/class-wp-users-list-table.php (modified) (3 diffs)

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

@@ -99 +99 @@
                 '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'
@@ -178 +178 @@
             $url = 'site-users.php?id=' . $this->site_id;
             switch_to_blog( $this->site_id );
-            $users_of_blog = count_users();
+            $users_of_blog = count_users( 'time', $this->site_id );
             restore_current_blog();
         } else {
@@ -370 +370 @@
 
         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 );
         }