Merge pull request #21 from soulseekah/fix-user-get-email-login

Support emails in user_login field

Author: danielbachhuber

features/user.feature

@@ -306,3 +306,19 @@ Feature: Manage WordPress users
       http://example.com/?author=1
       http://example.com/?author=2
       """
+
+  Scenario: Get user with email as login
+    Given a WP install
+    And I run `wp user create testuser4@example.com testemail4@example.com`
+
+    When I run `wp user get testemail4@example.com --field=user_login`
+    Then STDOUT should be:
+      """
+      [email protected]
+      """
+
+    When I run `wp user get testuser4@example.com --field=user_login`
+    Then STDOUT should be:
+      """
+      [email protected]
+      """

src/WP_CLI/Fetchers/User.php

@@ -20,12 +20,17 @@ class User extends Base {
 	 */
 	public function get( $id_email_or_login ) {
 
-		if ( is_numeric( $id_email_or_login ) )
+		if ( is_numeric( $id_email_or_login ) ) {
 			$user = get_user_by( 'id', $id_email_or_login );
-		else if ( is_email( $id_email_or_login ) )
+		} elseif ( is_email( $id_email_or_login ) ) {
 			$user = get_user_by( 'email', $id_email_or_login );
-		else
+			// Logins can be emails
+			if ( ! $user ) {
+				$user = get_user_by( 'login', $id_email_or_login );
+			}
+		} else {
 			$user = get_user_by( 'login', $id_email_or_login );
+		}
 
 		return $user;
 	}