X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/dc1231b7312fbdca99e9e887cc2bb35a28f85cdc..refs/tags/wordpress-4.4:/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 962f34aa..9062d9f0 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -1,11 +1,19 @@
'all_with_meta'
);
- if ( wp_is_large_network( 'users' ) )
+ if ( wp_is_large_network( 'users' ) ) {
$args['search'] = ltrim( $args['search'], '*' );
+ } else if ( '' !== $args['search'] ) {
+ $args['search'] = trim( $args['search'], '*' );
+ $args['search'] = '*' . $args['search'] . '*';
+ }
- if ( $role == 'super' ) {
+ if ( $role === 'super' ) {
$logins = implode( "', '", get_super_admins() );
$args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
}
@@ -71,6 +83,9 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+ /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
+ $args = apply_filters( 'users_list_table_query_args', $args );
+
// Query the user IDs for this page
$wp_user_search = new WP_User_Query( $args );
@@ -118,7 +133,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
$class = $role != 'super' ? ' class="current"' : '';
$role_links = array();
$role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '';
- $class = $role == 'super' ? ' class="current"' : '';
+ $class = $role === 'super' ? ' class="current"' : '';
$role_links['super'] = "" . sprintf( _n( 'Super Admin (%s)', 'Super Admins (%s)', $total_admins ), number_format_i18n( $total_admins ) ) . '';
return $role_links;
@@ -133,8 +148,9 @@ class WP_MS_Users_List_Table extends WP_List_Table {
parent::pagination ( $which );
- if ( 'top' == $which )
+ if ( 'top' === $which ) {
$this->view_switcher( $mode );
+ }
}
/**
@@ -146,7 +162,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
'cb' => '',
'username' => __( 'Username' ),
'name' => __( 'Name' ),
- 'email' => __( 'E-mail' ),
+ 'email' => __( 'Email' ),
'registered' => _x( 'Registered', 'user' ),
'blogs' => __( 'Sites' )
);
@@ -183,12 +199,27 @@ class WP_MS_Users_List_Table extends WP_List_Table {
* @param WP_User $user The current WP_User object.
*/
public function column_cb( $user ) {
+ if ( is_super_admin( $user->ID ) ) {
+ return;
+ }
?>
ID;
+ }
+
/**
* Handles the username column output.
*
@@ -248,7 +279,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
*/
public function column_registered( $user ) {
global $mode;
- if ( 'list' == $mode ) {
+ if ( 'list' === $mode ) {
$date = __( 'Y/m/d' );
} else {
$date = __( 'Y/m/d g:i:s a' );
@@ -291,7 +322,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
continue;
}
- $path = ( $val->path == '/' ) ? '' : $val->path;
+ $path = ( $val->path === '/' ) ? '' : $val->path;
echo '';
echo '' . str_replace( '.' . get_current_site()->domain, '', $val->domain . $path ) . '';
echo ' ';