Ticket #31788: 31788.patch
File 31788.patch, 2.2 KB (added by , 9 years ago) |
---|
-
src/wp-login.php
279 279 } elseif ( strpos( $_POST['user_login'], '@' ) ) { 280 280 $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); 281 281 if ( empty( $user_data ) ) 282 $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));282 $errors->add('invalid_email', __('<strong>ERROR</strong>: There are no user accounts using that username or e-mail address. Please try again.')); 283 283 } else { 284 284 $login = trim($_POST['user_login']); 285 285 $user_data = get_user_by('login', $login); … … 296 296 return $errors; 297 297 298 298 if ( !$user_data ) { 299 $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));299 $errors->add('invalidcombo', __('<strong>ERROR</strong>: There are no user accounts using that username or e-mail address. Please try again.')); 300 300 return $errors; 301 301 } 302 302 … … 363 363 $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; 364 364 $message .= network_home_url( '/' ) . "\r\n\r\n"; 365 365 $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 366 $message .= __('If this was a mistake, just ignore this e mail and nothing will happen.') . "\r\n\r\n";366 $message .= __('If this was a mistake, just ignore this e-mail and nothing will happen.') . "\r\n\r\n"; 367 367 $message .= __('To reset your password, visit the following address:') . "\r\n\r\n"; 368 368 $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n"; 369 369 … … 545 545 */ 546 546 do_action( 'lost_password' ); 547 547 548 login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or e mail address. You will receive a link to create a new password via email.') . '</p>', $errors);548 login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or e-mail address. You will receive a link to create a new password via e-mail.') . '</p>', $errors); 549 549 550 550 $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : ''; 551 551