WordPress.org

Make WordPress Core

Ticket #9682: 9682.diff

File 9682.diff, 2.4 KB (added by Denis-de-Bernardy, 12 years ago)
  • wp-login.php

     
    147147        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
    148148        $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
    149149        $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n";
    150 
    151         if ( !wp_mail($user_email, sprintf(__('[%s] Password Reset'), get_option('blogname')), $message) )
     150       
     151        $title = sprintf(__('[%s] Password Reset'), get_option('blogname'));
     152       
     153        $title = apply_filters('retrieve_password_title', $title);
     154        $message = apply_filters('retrieve_password_message', $message, $key);
     155       
     156        if ( $message && !wp_mail($user_email, $title, $message) )
    152157                die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
    153158
    154159        return true;
     
    174179        if ( empty( $user ) )
    175180                return new WP_Error('invalid_key', __('Invalid key'));
    176181
    177         do_action('password_reset', $user);
    178 
    179182        // Generate something random for a password...
    180183        $new_pass = wp_generate_password();
     184       
     185        do_action('password_reset', $user, $new_pass);
     186
    181187        wp_set_password($new_pass, $user->ID);
    182188        $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
    183189        $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
    184190        $message .= site_url('wp-login.php', 'login') . "\r\n";
     191       
     192        $title = sprintf(__('[%s] Your new password'), get_option('blogname'));
     193       
     194        $title = apply_filters('password_reset_title', $title);
     195        $message = apply_filters('password_reset_message', $message, $new_pass);
    185196
    186         if (  !wp_mail($user->user_email, sprintf(__('[%s] Your new password'), get_option('blogname')), $message) )
     197        if ( $message && !wp_mail($user->user_email, $title, $message) )
    187198                die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>');
    188199
    189200        wp_password_change_notification($user);
     
    403414break;
    404415
    405416case 'login' :
    406 default:
     417case '':
    407418        $secure_cookie = '';
    408419
    409420        // If the user wants ssl but the session is not ssl, force a secure cookie.
     
    514525<?php
    515526
    516527break;
     528
     529// allow plugins to add extra actions if they want
     530default:
     531do_action('login_form_' . $action);
    517532} // end action switch
    518 ?>
     533?>
     534 No newline at end of file