Changeset 30742

Timestamp:

12/05/2014 01:14:03 AM (10 years ago)

Author:

nacin

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

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

trunk/src/wp-admin/includes/upgrade.php

@@ -285 +285 @@
 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!
@@ -293 +293 @@
 --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);

trunk/src/wp-includes/ms-functions.php

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