Changeset 6886

Timestamp:

02/17/2008 08:16:22 PM (18 years ago)

Author:

ryan

Message:

Remove pseudo role group by

Location:

trunk/wp-admin

Files:

• includes/user.php (modified) (3 diffs)
• users.php (modified) (3 diffs)

trunk/wp-admin/includes/user.php

@@ -292 +292 @@
     var $role;
     var $raw_page;
-    var $users_per_page = 50;
+    var $users_per_page = 2;
     var $first_user;
     var $last_user;
     var $query_limit;
+    var $query_sort;
     var $query_from_where;
     var $total_users_for_query = 0;
@@ -316 +317 @@
         global $wpdb;
         $this->first_user = ($this->page - 1) * $this->users_per_page;
-        $this->query_limit = 'LIMIT ' . $this->first_user . ',' . $this->users_per_page;
+        $this->query_limit = ' LIMIT ' . $this->first_user . ',' . $this->users_per_page;
+        $this->query_sort = ' ORDER BY user_login';
         $search_sql = '';
         if ( $this->search_term ) {
@@ -338 +340 @@
     function query() {
         global $wpdb;
-        $this->results = $wpdb->get_col('SELECT ID ' . $this->query_from_where . $this->query_limit);
+        $this->results = $wpdb->get_col('SELECT ID ' . $this->query_from_where . $this->query_sort . $this->query_limit);
 
         if ( $this->results )

trunk/wp-admin/users.php

@@ -186 +186 @@
     $wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage'], $_GET['role']);
 
-    // Make the user objects
-    foreach ( $wp_user_search->get_results() as $userid ) {
-        $tmp_user = new WP_User($userid);
-        $roles = $tmp_user->roles;
-        $role = array_shift($roles);
-        $roleclasses[$role][$tmp_user->user_login] = $tmp_user;
-    }
-
     if ( isset($_GET['update']) ) :
         switch($_GET['update']) {
@@ -261 +253 @@
     }
 }
+unset($users_of_blog);
 
 foreach ( $wp_roles->get_names() as $role => $name ) {
@@ -334 +327 @@
 </tr>
 </tbody>
-<?php
-foreach ($roleclasses as $role => $roleclass) {
-    uksort($roleclass, "strnatcasecmp");
-?>
-<tbody id="role-<?php echo $role; ?>" class="list:user user-list"><?php
-$style = '';
-foreach ( (array) $roleclass as $user_object ) {
+<tbody id="users" class="list:user user-list">
+<?php
+foreach ( $wp_user_search->get_results() as $userid ) {
+    $user_object = new WP_User($userid);
+    $roles = $user->roles;
+    $role = array_shift($roles);
+
+    $style = '';
     $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
     echo "\n\t" . user_row($user_object, $style, $role);
 }
 ?>
-
 </tbody>
-<?php } ?>
 </table>