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

Remove non-translatable HTML code from the first post content in `populate_network()` and `wp_install_defaults()`. 

Add translator comment.

Props ramiy.
Fixes #34619.
Built from https://develop.svn.wordpress.org/trunk@35614


git-svn-id: http://core.svn.wordpress.org/trunk@35578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-11-11 20:55:26 +00:00
parent d206e633c2
commit db8c89cccb
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -983,7 +983,8 @@ We hope you enjoy your new site. Thanks!
'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ), 'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
'wpmu_upgrade_site' => $wp_db_version, 'wpmu_upgrade_site' => $wp_db_version,
'welcome_email' => $welcome_email, 'welcome_email' => $welcome_email,
'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ), /* translators: %s: site link */
'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
// @todo - network admins should have a method of editing the network siteurl (used for cookie hash) // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
'siteurl' => get_option( 'siteurl' ) . '/', 'siteurl' => get_option( 'siteurl' ) . '/',
'add_new_users' => '0', 'add_new_users' => '0',

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

@ -155,11 +155,18 @@ function wp_install_defaults( $user_id ) {
if ( is_multisite() ) { if ( is_multisite() ) {
$first_post = get_site_option( 'first_post' ); $first_post = get_site_option( 'first_post' );
if ( empty($first_post) ) if ( ! $first_post ) {
$first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' ); /* translators: %s: site link */
$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
}
$first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post ); $first_post = sprintf( $first_post,
$first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post ); sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->site_name )
);
// Back-compat for pre-4.4
$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
$first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post );
} else { } else {
$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ); $first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-beta3-35613'; $wp_version = '4.4-beta3-35614';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.