diff --git a/wp-includes/class-wp-user-query.php b/wp-includes/class-wp-user-query.php index 8d22a58e87..ebfdfc3aea 100644 --- a/wp-includes/class-wp-user-query.php +++ b/wp-includes/class-wp-user-query.php @@ -868,23 +868,23 @@ class WP_User_Query { * * @global wpdb $wpdb WordPress database abstraction object. * - * @param string $string + * @param string $search * @param array $cols * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for single site. * Single site allows leading and trailing wildcards, Network Admin only trailing. * @return string */ - protected function get_search_sql( $string, $cols, $wild = false ) { + protected function get_search_sql( $search, $cols, $wild = false ) { global $wpdb; $searches = array(); $leading_wild = ( 'leading' === $wild || 'both' === $wild ) ? '%' : ''; $trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : ''; - $like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild; + $like = $leading_wild . $wpdb->esc_like( $search ) . $trailing_wild; foreach ( $cols as $col ) { if ( 'ID' === $col ) { - $searches[] = $wpdb->prepare( "$col = %s", $string ); + $searches[] = $wpdb->prepare( "$col = %s", $search ); } else { $searches[] = $wpdb->prepare( "$col LIKE %s", $like ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index bd0b62f826..8649cabcb9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta2-53275'; +$wp_version = '6.0-beta2-53276'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.