Ticket #18755: 18755.patch

wp-login.php

@@ -168 +168 @@
 
         $errors = new WP_Error();
 
-        if ( empty( $_POST['user_login'] ) && empty( $_POST['user_email'] ) )
+        if ( empty( $_POST['user_login'] ) ) {
                 $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
-
-        if ( strpos($_POST['user_login'], '@') ) {
+        }
+        else if ( strpos($_POST['user_login'], '@') ) {
                 $user_data = get_user_by('email', trim($_POST['user_login']));
                 if ( empty($user_data) )
                         $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));