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

In the `wp_new_blog_notification()` email template, include the login url. 

Props obenland, georgestephanis.
Fixes #21089.

Built from https://develop.svn.wordpress.org/trunk@29806


git-svn-id: http://core.svn.wordpress.org/trunk@29572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-10-02 01:28:16 +00:00
parent eccf8e1a12
commit 258496edb6
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/schema.php
View File

@ -915,9 +915,10 @@ Your new SITE_NAME site has been successfully set up at:
BLOG_URL
You can log in to the administrator account with the following information:
Log in here: BLOG_URLwp-login.php
Username: USERNAME
Password: PASSWORD
Log in here: BLOG_URLwp-login.php
We hope you enjoy your new site. Thanks!

6
wp-admin/includes/upgrade.php
View File

@ -277,12 +277,14 @@ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
$user = new WP_User( $user_id );
$email = $user->user_email;
$name = $user->user_login;
$message = sprintf(__("Your new WordPress site has been successfully set up at:
$login_url = wp_login_url();
$message = sprintf( __( "Your new WordPress site has been successfully set up at:
%1\$s
You can log in to the administrator account with the following information:
Log in here: %4\$s
Username: %2\$s
Password: %3\$s
@ -290,7 +292,7 @@ We hope you enjoy your new site. Thanks!
--The WordPress Team
https://wordpress.org/
"), $blog_url, $name, $password);
"), $blog_url, $name, $password, $login_url );
@wp_mail($email, __('New WordPress Site'), $message);
}

3
wp-includes/ms-functions.php
View File

@ -1469,9 +1469,10 @@ Your new SITE_NAME site has been successfully set up at:
BLOG_URL
You can log in to the administrator account with the following information:
Log in here: BLOG_URLwp-login.php
Username: USERNAME
Password: PASSWORD
Log in here: BLOG_URLwp-login.php
We hope you enjoy your new site. Thanks!