WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Login and Registration: Replace home URL in password reset email with the site name to avoid confusing the user with multiple links. 

Props Presskopp, code-monkey.
Fixes #38328.
Built from https://develop.svn.wordpress.org/trunk@41578


git-svn-id: http://core.svn.wordpress.org/trunk@41411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-09-23 11:44:46 +00:00
parent b844c63db0
commit 649eb34d2a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41577'; $wp_version = '4.9-alpha-41578';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

24
wp-login.php
View File

@ -324,25 +324,27 @@ function retrieve_password() {
return $key; return $key;
} }
$message = __('Someone has requested a password reset for the following account:') . "\r\n\r\n";
$message .= network_home_url( '/' ) . "\r\n\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
$message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
if ( is_multisite() ) { if ( is_multisite() ) {
$blogname = get_network()->site_name; $site_name = get_network()->site_name;
} else { } else {
/* /*
* The blogname option is escaped with esc_html on the way into the database * 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. * in sanitize_option we want to reverse this for the plain text arena of emails.
*/ */
$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
} }
/* translators: Password reset email subject. 1: Site name */ $message = __( 'Someone has requested a password reset for the following account:' ) . "\r\n\r\n";
$title = sprintf( __('[%s] Password Reset'), $blogname ); /* translators: %s: site name */
$message .= sprintf( __( 'Site Name: %s'), $site_name ) . "\r\n\r\n";
/* translators: %s: user login */
$message .= sprintf( __( 'Username: %s'), $user_login ) . "\r\n\r\n";
$message .= __( 'If this was a mistake, just ignore this email and nothing will happen.' ) . "\r\n\r\n";
$message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
$message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . ">\r\n";
/* translators: Password reset email subject. %s: Site name */
$title = sprintf( __( '[%s] Password Reset' ), $site_name );
/** /**
* Filters the subject of the password reset email. * Filters the subject of the password reset email.