From d2f9cbf7be9c26875548fdc6d5674ba98bc38641 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 7 Mar 2019 12:35:52 +0000 Subject: [PATCH] Users: Use `login__in` parameter for `WP_User_Query` in `WP_MS_Users_List_Table::prepare_items()`, instead of a manual query. Props spacedmonkey. Fixes #45223. Built from https://develop.svn.wordpress.org/trunk@44813 git-svn-id: http://core.svn.wordpress.org/trunk@44645 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-users-list-table.php | 6 ++---- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) 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 eb507dafac..e61ae97cbd 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -26,11 +26,10 @@ class WP_MS_Users_List_Table extends WP_List_Table { /** * @global string $usersearch * @global string $role - * @global wpdb $wpdb * @global string $mode */ public function prepare_items() { - global $usersearch, $role, $wpdb, $mode; + global $usersearch, $role, $mode; $usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : ''; @@ -56,8 +55,7 @@ class WP_MS_Users_List_Table extends WP_List_Table { } if ( $role === 'super' ) { - $logins = implode( "', '", get_super_admins() ); - $args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" ); + $args['login__in'] = get_super_admins(); } /* diff --git a/wp-includes/version.php b/wp-includes/version.php index 0fa98fbe4e..078fad42ed 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-alpha-44812'; +$wp_version = '5.2-alpha-44813'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.