Changes in trunk/wp-admin/includes/class-wp-ms-users-list-table.php [18254:18871]

File:

• trunk/wp-admin/includes/class-wp-ms-users-list-table.php (modified) (3 diffs)

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

@@ -33 +33 @@
         );
 
-        $args['search'] = ltrim($args['search'], '*');
+        if ( wp_is_large_network( 'users' ) )
+            $args['search'] = ltrim( $args['search'], '*' );
 
         if ( $role == 'super' ) {
@@ -42 +43 @@
         // 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';
@@ -189 +190 @@
                                 $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>';
                                 }