Ticket #12129: 12129.diff

wp-includes/user.php

@@ -86 +86 @@
         $userdata = get_user_by('login', $username);
 
         if ( !$userdata )
-                return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
+                return new WP_Error('invalidcombo', sprintf(__('<strong>ERROR</strong>: Incorrect username or password. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
 
         if ( is_multisite() ) {
                 // Is user marked as spam?
@@ -106 +106 @@
                 return $userdata;
 
         if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) )
-                return new WP_Error('incorrect_password', sprintf(__('<strong>ERROR</strong>: Incorrect password. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
+                return new WP_Error('invalidcombo', sprintf(__('<strong>ERROR</strong>: Incorrect username or password. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
 
         $user =  new WP_User($userdata->ID);
         return $user;

wp-login.php

@@ -572 +572 @@
         login_header(__('Log In'), '', $errors);
 
         if ( isset($_POST['log']) )
-                $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
+                $user_login = ( 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
 ?>
 
 <?php if ( !isset($_GET['checkemail']) || !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>