Changeset 15876

Timestamp:

10/20/2010 08:43:32 PM (16 years ago)

Author:

ryan

Message:

Add query args argument to get_users_of_blog(). Limit number of users fetched for user lists in sites table and edit blog form. see #15053

Location:

trunk

Files:

• wp-admin/includes/default-list-tables.php (modified) (1 diff)
• wp-admin/network/sites.php (modified) (2 diffs)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -2959 +2959 @@
                                                 <td valign="top">
                                                         <?php
-                                                        $blogusers = get_users_of_blog( $blog['blog_id'] );
+                                                        $blogusers = get_users_of_blog( $blog['blog_id'], array('number' => 6) );
                                                         if ( is_array( $blogusers ) ) {
                                                                 $blogusers_warning = '';

trunk/wp-admin/network/sites.php

@@ -258 +258 @@
 
                                 // Site users
-                                $blogusers = get_users_of_blog( $id );
-
+                                $blogusers = get_users_of_blog( $id, array('number' => 20) );
                                 if ( is_array( $blogusers ) ) {
                                         echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __( 'Site Users' ) . '</span></h3><div class="inside">';
                                         echo '<table class="form-table">';
                                         echo "<tr><th>" . __( 'User' ) . "</th><th>" . __( 'Role' ) . "</th><th>" . __( 'Password' ) . "</th><th>" . __( 'Remove' ) . "</th></tr>";
+                                        $user_count = 0;
                                         foreach ( $blogusers as $user_id => $user_object ) {
+                                                $user_count++;
                                                 $existing_role = reset( $user_object->roles );
 
@@ -291 +292 @@
                                         echo "</table>";
                                         echo '<p class="submit" style="text-align:center;"><input type="submit" name="Submit" value="' . esc_attr__( 'Update Options' ) . '" /></p>';
+                                        if ( 20 == $user_count )
+                                                echo '<p>' . sprintf( __('First 20 users shown. <a href="%s">Manage all users</a>.'), get_admin_url($id, 'users.php') ) . '</p>';
                                         echo "</div></div>";
                                 }

trunk/wp-includes/user.php

@@ -564 +564 @@
  *
  * @param int $id Blog ID.
+ * @param array $args Optional query arguments passed to get_users()
  * @return array List of users that are part of that Blog ID
  */
-function get_users_of_blog( $id = '' ) {
+function get_users_of_blog( $id = '', $args = array() ) {
         global $blog_id;
 
@@ -572 +573 @@
                 $id = (int) $blog_id;
 
-        return get_users( array( 'blog_id' => $id ) );
+        $args['blog_id'] = $id;
+        return get_users( $args );
 }