From a285a1cf2245e498cd87c6f365ee5df68c8f84dd Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Oct 2015 23:03:26 +0000 Subject: [PATCH] Use `home_url()` instead of `get_option( 'siteurl' )` in notifications that are sent when a user's email address or password is changed. Props tyxla, ramay. Fixes #34071. Built from https://develop.svn.wordpress.org/trunk@34820 git-svn-id: http://core.svn.wordpress.org/trunk@34785 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/user-functions.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/user-functions.php b/wp-includes/user-functions.php index 50f40df143..af3d1e2db1 100644 --- a/wp-includes/user-functions.php +++ b/wp-includes/user-functions.php @@ -1676,7 +1676,7 @@ All at ###SITENAME### $pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] ); $pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] ); $pass_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $pass_change_email['message'] ); - $pass_change_email['message'] = str_replace( '###SITEURL###', get_option( 'siteurl' ), $pass_change_email['message'] ); + $pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $pass_change_email['message'] ); wp_mail( $pass_change_email['to'], sprintf( $pass_change_email['subject'], $blog_name ), $pass_change_email['message'], $pass_change_email['headers'] ); } @@ -1730,7 +1730,7 @@ All at ###SITENAME### $email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] ); $email_change_email['message'] = str_replace( '###SITENAME###', get_option( 'blogname' ), $email_change_email['message'] ); - $email_change_email['message'] = str_replace( '###SITEURL###', get_option( 'siteurl' ), $email_change_email['message'] ); + $email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] ); wp_mail( $email_change_email['to'], sprintf( $email_change_email['subject'], $blog_name ), $email_change_email['message'], $email_change_email['headers'] ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 692a82c10a..ba5d966a44 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34819'; +$wp_version = '4.4-alpha-34820'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.