From 96dee2af6270617adb9b3ef781449c41b5d2fac7 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Fri, 5 Dec 2014 01:14:03 +0000
Subject: [PATCH] Adjust [29806] and revert [29807] to restore placeholder and
 email copy order.

Avoids unnecessarily changing a (large, carefully formatted) translated string from 4.0.

fixes #21089.


git-svn-id: https://develop.svn.wordpress.org/trunk@30742 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/schema.php  | 2 +-
 src/wp-admin/includes/upgrade.php | 8 ++++----
 src/wp-includes/ms-functions.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index 2cfe9e0765..296a6992e1 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -917,9 +917,9 @@ 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/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 2a3f5a2ab6..15a1097fe8 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -284,15 +284,15 @@ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
 
 You can log in to the administrator account with the following information:
 
-Log in here: %2\$s
-Username: %3\$s
-Password: %4\$s
+Username: %2\$s
+Password: %3\$s
+Log in here: %4\$s
 
 We hope you enjoy your new site. Thanks!
 
 --The WordPress Team
 https://wordpress.org/
-"), $blog_url, $login_url, $name, $password );
+"), $blog_url, $name, $password, $login_url );
 
 	@wp_mail($email, __('New WordPress Site'), $message);
 }
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
index 2b6c55594c..5537fb3644 100644
--- a/src/wp-includes/ms-functions.php
+++ b/src/wp-includes/ms-functions.php
@@ -1444,9 +1444,9 @@ 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!