Ticket #22993: 22993.2.diff

wp-includes/user.php

@@ -1077 +1077 @@
 //
 
 /**
+ * Get array of user IDs that have no role
+ */
+function wp_get_norole_users() {
+        global $wpdb, $wp_roles;
+        $id = get_current_blog_id();
+        $blog_prefix = $wpdb->get_blog_prefix($id);
+        if ( ! isset( $wp_roles ) )
+                $wp_roles = new WP_Roles();
+        $role_keys = array_keys( $wp_roles->get_names() );
+        $norole_regexp = implode( "|", $role_keys );
+        $norole_users = $wpdb->get_col( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities' AND meta_value NOT REGEXP '{$norole_regexp}'" );
+        return $norole_users;
+}
+
+/**
  * Set up global user vars.
  *
  * Used by wp_set_current_user() for back compat. Might be deprecated in the future.

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

@@ -44 +44 @@
 
                 $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 ) && ( $norole_users = wp_get_norole_users() ) ) {
+                        $args = array(
+                                'number' => $users_per_page,
+                                'offset' => ( $paged-1 ) * $users_per_page,
+                                'include' => $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'] . '*';
@@ -116 +126 @@
                         $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
                 }
 
+                if ( $norole_users = wp_get_norole_users() ) {
+                        $class = ( isset( $_REQUEST['role'] ) && ( 'none' == $_REQUEST['role'] ) ) ? ' class="current"' : '';
+                        $norole_user_count = count( $norole_users );
+                        $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>" . sprintf( _nx( 'None <span class="count">(%s)</span>', 'None <span class="count">(%s)</span>', $norole_user_count, 'users' ), number_format_i18n( $norole_user_count ) ) . '</a>';
+                }
+
                 return $role_links;
         }