Ticket #22993: 22993.3.diff

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

@@ -87 +87 @@
 
                 $paged = $this->get_pagenum();
 
-                $args = array(
-                        'number' => $users_per_page,
-                        'offset' => ( $paged-1 ) * $users_per_page,
-                        'role' => $role,
-                        'search' => $usersearch,
-                        'fields' => 'all_with_meta'
-                );
+                if ( 'none' === $role ) {
+                        $args = array(
+                                'number' => $users_per_page,
+                                'offset' => ( $paged-1 ) * $users_per_page,
+                                'include' => wp_get_norole_users(),
+                                'search' => $usersearch,
+                                'fields' => 'all_with_meta'
+                        );
+                } else {
+                        $args = array(
+                                'number' => $users_per_page,
+                                'offset' => ( $paged-1 ) * $users_per_page,
+                                'role' => $role,
+                                'search' => $usersearch,
+                                'fields' => 'all_with_meta'
+                        );
+                }
 
                 if ( '' !== $args['search'] )
                         $args['search'] = '*' . $args['search'] . '*';
@@ -156 +166 @@
                         $url = 'users.php';
                         $users_of_blog = count_users();
                 }
+
                 $total_users = $users_of_blog['total_users'];
                 $avail_roles =& $users_of_blog['avail_roles'];
                 unset($users_of_blog);
@@ -179 +190 @@
                         $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
                 }
 
+                if ( ! empty( $avail_roles['none' ] ) ) {
+
+                        $class = '';
+
+                        if ( 'none' === $role ) {
+                                $class = ' class="current"';
+                        }
+
+                        $name = __( 'No role' );
+                        /* translators: User role name with count */
+                        $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+                        $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+
+                }
+
                 return $role_links;
         }
 

src/wp-includes/user-functions.php

@@ -775 +775 @@
                 // Get the meta_value index from the end of the result set.
                 $total_users = (int) $row[$col];
 
+                $role_counts['none'] = ( $total_users - array_sum( $role_counts ) );
+
                 $result['total_users'] = $total_users;
                 $result['avail_roles'] =& $role_counts;
         } else {
@@ -786 +788 @@
                         $b_roles = maybe_unserialize($caps_meta);
                         if ( ! is_array( $b_roles ) )
                                 continue;
+                        if ( empty( $b_roles ) ) {
+                                if ( isset( $avail_roles['none'] ) ) {
+                                        $avail_roles['none']++;
+                                } else {
+                                        $avail_roles['none'] = 1;
+                                }
+                        }
                         foreach ( $b_roles as $b_role => $val ) {
                                 if ( isset($avail_roles[$b_role]) ) {
                                         $avail_roles[$b_role]++;
@@ -2143 +2152 @@
         $manager = WP_Session_Tokens::get_instance( get_current_user_id() );
         $manager->destroy_all();
 }
+
+/**
+ * Get the user IDs of all users with no role on this site.
+ *
+ * @since 4.4.0
+ *
+ * @return array Array of user IDs.
+ */
+function wp_get_norole_users() {
+        global $wpdb;
+        $wp_roles = wp_roles();
+        $blog_prefix = $wpdb->get_blog_prefix();
+        $norole_regexp = implode( '|', array_keys( $wp_roles->get_names() ) );
+        $norole_users = $wpdb->get_col( $wpdb->prepare( "
+                SELECT user_id
+                FROM $wpdb->usermeta
+                WHERE meta_key = '{$blog_prefix}capabilities'
+                AND meta_value NOT REGEXP %s
+        ", $norole_regexp ) );
+        return $norole_users;
+}