X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/38ca813a0e312e2768e5b9519f0415cd0aa84781..72836ec95a52eacbda4dc5aa296b7dd6de08bd3b:/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 66c41c4c..ab1ee362 100644
--- 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,10 +162,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$attributes = "$class$style";
-
switch ( $column_name ) {
case 'cb': ?>
+
|
user_email, 32 );
- if ( get_current_user_id() == $user->ID ) {
- $edit_link = esc_url( network_admin_url( 'profile.php' ) );
- } else {
- $edit_link = esc_url( network_admin_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . $user->ID ) ) );
- }
+ $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
echo ""; ?>
- user_login ); ?>user_login; ?>user_login, $super_admins ) )
echo ' - ' . __( 'Super Admin' );
?>
@@ -188,8 +185,8 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$actions = array();
$actions['edit'] = '' . __( 'Edit' ) . '';
- if ( current_user_can( 'delete_user', $user->ID) && ! in_array( $user->user_login, $super_admins ) ) {
- $actions['delete'] = '' . __( 'Delete' ) . '';
+ if ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
+ $actions['delete'] = '' . __( 'Delete' ) . '';
}
$actions = apply_filters( 'ms_user_row_actions', $actions, $user );
@@ -241,7 +238,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'] = '' . __( 'View' ) . '';
+ $actions['view'] = '' . __( 'View' ) . '';
$actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);
@@ -273,5 +270,3 @@ class WP_MS_Users_List_Table extends WP_List_Table {
}
}
}
-
-?>
|