WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-ms-users-list-table.php

diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 66c41c4c6bcb92ba74a3c6476a9edecca6bdeb35..67564fd65000e65dd76aeeb19273743af0131975 100644 (file)
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -32,7 +32,8 @@ class WP_MS_Users_List_Table extends WP_List_Table {
                        'fields' => 'all_with_meta'
                );
 
-               $args['search'] = ltrim($args['search'], '*');
+               if ( wp_is_large_network( 'users' ) )
+                       $args['search'] = ltrim( $args['search'], '*' );
 
                if ( $role == 'super' ) {
                        $logins = implode( "', '", get_super_admins() );
@@ -41,7 +42,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 
                // 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 ( !$usersearch && wp_is_large_network( 'users' ) ) {
                        if ( !isset($_REQUEST['orderby']) )
                                $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
                        if ( !isset($_REQUEST['order']) )
@@ -161,7 +162,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 
                                $attributes = "$class$style";
 
-
                                switch ( $column_name ) {
                                        case 'cb': ?>
                                                <th scope="row" class="check-column">
@@ -188,8 +188,8 @@ class WP_MS_Users_List_Table extends WP_List_Table {
                                                                $actions = array();
                                                                $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
 
-                                                               if ( current_user_can( 'delete_user', $user->ID) && ! in_array( $user->user_login, $super_admins ) ) {
-                                                                       $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'edit.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
+                                                               if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
+                                                                       $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&amp;action=deleteuser&amp;id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
                                                                }
 
                                                                $actions = apply_filters( 'ms_user_row_actions', $actions, $user );
@@ -241,7 +241,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
                                                                        if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
                                                                                $class .= 'site-archived ';
 
-                                                                       $actions['view'] = '<a class="' . $class . '" href="' .  esc_url( get_home_url( $val->userblog_id ) )  . '">' . __( 'View' ) . '</a>';
+                                                                       $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
 
                                                                        $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);
 
@@ -273,5 +273,3 @@ class WP_MS_Users_List_Table extends WP_List_Table {
                }
        }
 }
-
-?>