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

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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-12-05 01:15:26 +00:00
parent a83fdf7b17
commit 1cf7a49ffd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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);
}

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

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

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-beta2-30741';
$wp_version = '4.1-beta2-30742';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.