Ticket #21089: 21089.2.patch

wp-includes/ms-functions.php

@@ -1223 +1223 @@
 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!
 

wp-admin/includes/upgrade.php

@@ -318 +318 @@
  * @param int $user_id User ID.
  * @param string $password User's Password.
  */
-function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-        $user = new WP_User($user_id);
+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
 
@@ -335 +337 @@
 
 --The WordPress Team
 http://wordpress.org/
-"), $blog_url, $name, $password);
+" ), $blog_url, $name, $password, $login_url );
 
-        @wp_mail($email, __('New WordPress Site'), $message);
+        @wp_mail( $email, __( 'New WordPress Site' ), $message );
 }
 endif;
 

wp-admin/includes/schema.php

@@ -873 +873 @@
 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!