Skip to content

Use proper WP_User_Query for fetching users #5600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schlessera merged 7 commits into from
Jan 13, 2022
Merged

Use proper WP_User_Query for fetching users #5600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d46c293
Use proper `WP_User_Query` for fetching users
schlessera Jan 13, 2022
b0dcb8a
Use array for search columns
schlessera Jan 13, 2022
082fd51
Fix bad conditional
schlessera Jan 13, 2022
46b0d94
Limit results to a single user
schlessera Jan 13, 2022
5881e51
Ensure at least one element is in array
schlessera Jan 13, 2022
67d58d8
Adapt error message
schlessera Jan 13, 2022
7a9565e
Use user_login search instead of login query
schlessera Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/help.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Feature: Get help about WP-CLI commands
Then the return code should be 1
And STDERR should contain:
"""
We were able to connect to the database server (which means your username and password is okay) but not able to select the `wp_cli_test` database.
Error establishing a database connection.
"""
And STDERR should contain:
"""
Expand Down
36 changes: 29 additions & 7 deletions php/WP_CLI/Fetchers/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,42 @@ class User extends Base {
* @return WP_User|false The item if found; false otherwise.
*/
public function get( $arg ) {

if ( is_numeric( $arg ) ) {
$user = get_user_by( 'id', $arg );
$users = get_users(
[
'include' => [ (int) $arg ],
'number' => 1,
]
);
} elseif ( is_email( $arg ) ) {
$user = get_user_by( 'email', $arg );
$users = get_users(
[
'search' => $arg,
'search_columns' => [ 'user_email' ],
'number' => 1,
]
);
// Logins can be emails.
if ( ! $user ) {
$user = get_user_by( 'login', $arg );
if ( ! $users ) {
$users = get_users(
[
'search' => $arg,
'search_columns' => [ 'user_login' ],
'number' => 1,
]
);
}
} else {
$user = get_user_by( 'login', $arg );
$users = get_users(
[
'search' => $arg,
'search_columns' => [ 'user_login' ],
'number' => 1,
]
);
}

return $user;
return ( is_array( $users ) && count( $users ) > 0 ) ? $users[0] : false;
}
}