Changeset 19056

Timestamp:

10/24/2011 09:31:30 PM (13 years ago)

Author:

ryan

Message:

Avoid warning when user_login not in POST. Props ampt. fixes #18755

File:

• trunk/wp-login.php (modified) (1 diff)

trunk/wp-login.php

@@ -169 +169 @@
     $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'], '@') ) {
-        $user_data = get_user_by('email', trim($_POST['user_login']));
-        if ( empty($user_data) )
+    } 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.'));
     } else {