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

Networks and Sites: Clarify the recommendation to remove the `www` prefix from the site domain before creating a network. 

The `siteurl` option reference was not quite clear, and the string actually refers to the domain name, not the full URL.

Props kharisblank, tobifjellner, ramiy.
Fixes #49214.
Built from https://develop.svn.wordpress.org/trunk@47085


git-svn-id: http://core.svn.wordpress.org/trunk@46885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-18 01:15:04 +00:00
parent 053a9cd5b8
commit 89f5d3dd0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,7 @@ function network_step1( $errors = false ) {
<?php <?php
printf( printf(
/* translators: 1: Site URL, 2: Host name, 3: www. */ /* translators: 1: Site URL, 2: Host name, 3: www. */
__( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ), __( 'We recommend you change your site domain to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
'<code>' . substr( $hostname, 4 ) . '</code>', '<code>' . substr( $hostname, 4 ) . '</code>',
'<code>' . $hostname . '</code>', '<code>' . $hostname . '</code>',
'<code>www</code>' '<code>www</code>'

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-47084'; $wp_version = '5.4-alpha-47085';
/** /**
* 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.