Ticket #35736: 35736.patch

wp-includes/pluggable.php

@@ -1714 +1714 @@
         // send a copy of password change notification to the admin
         // but check to see if it's the admin whose password we're changing, and skip this
         if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
-                $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+                $message = sprintf(__('Password changed for user: %s'), $user->user_login) . "\r\n";
                 // The blogname option is escaped with esc_html on the way into the database in sanitize_option
                 // we want to reverse this for the plain text arena of emails.
                 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
+                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Changed'), $blogname), $message);
         }
 }
 endif;

wp-includes/user.php

@@ -139 +139 @@
                 return new WP_Error( 'invalid_username',
                         __( '<strong>ERROR</strong>: Invalid username.' ) .
                         ' <a href="' . wp_lostpassword_url() . '">' .
-                        __( 'Lost your password?' ) .
+                        __( 'Reset Password' ) .
                         '</a>'
                 );
         }
@@ -165 +165 @@
                                 '<strong>' . $username . '</strong>'
                         ) .
                         ' <a href="' . wp_lostpassword_url() . '">' .
-                        __( 'Lost your password?' ) .
+                        __( 'Reset Password' ) .
                         '</a>'
                 );
         }

wp-login.php

@@ -519 +519 @@
          */
         do_action( 'lost_password' );
 
-        login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
+        login_header(__('Reset Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
 
         $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
 
@@ -605 +605 @@
         if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
                 reset_password($user, $_POST['pass1']);
                 setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-                login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+                login_header( __( 'Reset Password' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
                 login_footer();
                 exit;
         }
@@ -737 +737 @@
 
 <p id="nav">
 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> |
-<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Reset Password' ); ?></a>
 </p>
 
 <?php
@@ -920 +920 @@
                 echo apply_filters( 'register', $registration_url ) . ' | ';
         endif;
         ?>
-        <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+        <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Reset Password' ); ?></a>
 <?php endif; ?>
 </p>
 <?php } ?>