From 258496edb6d4923daa5a53bc0f76a2ba73668cd2 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 2 Oct 2014 01:28:16 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/schema.php  | 3 ++-
 wp-admin/includes/upgrade.php | 6 ++++--
 wp-includes/ms-functions.php  | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 1fc432f51e..a8f5b49015 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -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!
 
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 02dfe093d3..4d47c77403 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -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);
 }
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 3fc6646834..e3ae911373 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -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!