Changeset 16160

Timestamp:

11/03/2010 01:34:04 PM (16 years ago)

Author:

ryan

Message:

Show latest x users with no paging if on a large network. see #15170

Location:

trunk

Files:

• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

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

@@ -38 +38 @@
                         'blog_id' => 0
                 );
+
+                // If the network is large and a search is not being performed, show only the latest users with no paging in order
+                // to avoid expensive count queries.
+                if ( !$usersearch && ( get_blog_count() >= 10000 ) ) {
+                        if ( !isset($_REQUEST['orderby']) )
+                                $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
+                        if ( !isset($_REQUEST['order']) )
+                                $_GET['order'] = $_REQUEST['order'] = 'DESC';
+                        $args['count_total'] = false;
+                }
 
                 if ( isset( $_REQUEST['orderby'] ) )

trunk/wp-includes/user.php

@@ -412 +412 @@
                 if ( in_array( $qv['orderby'], array('email', 'url', 'registered') ) ) {
                         $orderby = 'user_' . $qv['orderby'];
-                }
-                elseif ( 'name' == $qv['orderby'] ) {
+                } elseif ( 'name' == $qv['orderby'] ) {
                         $orderby = 'display_name';
-                }
-                elseif ( 'post_count' == $qv['orderby'] ) {
+                } elseif ( 'post_count' == $qv['orderby'] ) {
                         $where = get_posts_by_author_sql('post');
                         $this->query_from .= " LEFT OUTER JOIN (
@@ -426 +424 @@
                         ";
                         $orderby = 'post_count';
-                }
-                else {
+                } elseif ( 'id' == $qv['orderby'] ) {
+                        $orderby = 'ID';
+                } else {
                         $orderby = 'user_login';
                 }