Ticket #36653: 36653.01.diff

src/wp-login.php

@@ -290 +290 @@
         global $wpdb, $wp_hasher;
 
         $errors = new WP_Error();
-
+        
+        $login = trim( $_POST['user_login'] );
         if ( empty( $_POST['user_login'] ) ) {
-                $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
-        } elseif ( 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.'));
+                $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or email address.' ) );
+        } elseif ( is_email( $login ) ) {
+                $user_data = get_user_by( 'email', $login );
+                if ( empty( $user_data ) ) {
+                        
+                        //Maybe the username has the format of an email address
+                        //So we check here, if we find a username for $login
+                        $user_data = get_user_by( 'login' , $login );
+                        if ( empty( $user_data ) ) {
+                                $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+                        }
+                }
         } else {
-                $login = trim($_POST['user_login']);
-                $user_data = get_user_by('login', $login);
+                $user_data = get_user_by( 'login', $login );
         }
 
         /**