WordPress.org
Get WordPress

Make WordPress Core

Ticket #42957: 42957-password-reset-username-ending-in-period-v2.diff

File 42957-password-reset-username-ending-in-period-v2.diff, 1.6 KB (added by paulcline, 7 years ago)

  • src/wp-includes/pluggable.php 

    diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
index 9af88a6ea2..44ebf87ed8 100644
    a b if ( ! function_exists( 'wp_new_user_notification' ) ) : 
    19501950                /* translators: %s: user login */
    19511951                $message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
    19521952                $message .= __( 'To set your password, visit the following address:' ) . "\r\n\r\n";
    1953                 $message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user->user_login ), 'login' ) . ">\r\n\r\n";
     1953                $message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . str_replace( ".", "%2E", rawurlencode( $user_login ) ), 'login' ) . ">\r\n\r\n";
    19541954
    19551955                $message .= wp_login_url() . "\r\n";
    19561956

  • src/wp-login.php 

    diff --git a/src/wp-login.php b/src/wp-login.php
index 6415b1544a..cb7e845149 100644
    a b function retrieve_password() { 
    376376        $message .= sprintf( __( 'Username: %s' ), $user_login ) . "\r\n\r\n";
    377377        $message .= __( 'If this was a mistake, just ignore this email and nothing will happen.' ) . "\r\n\r\n";
    378378        $message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
    379         $message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . ">\r\n";
     379        $message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . str_replace( ".", "%2E", rawurlencode( $user_login ) ), 'login' ) . ">\r\n";
    380380
    381381        /* translators: Password reset email subject. %s: Site name */
    382382        $title = sprintf( __( '[%s] Password Reset' ), $site_name );