diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index d04b4f9a28..fef6b66850 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -144,8 +144,18 @@ function network_step1( $errors = false ) { $error_codes = $errors->get_error_codes(); } - $site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) ); - $admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' ); + if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) { + $site_name = $_POST['sitename']; + } else { + /* translators: %s: Default network name */ + $site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) ); + } + + if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) { + $admin_email = $_POST['email']; + } else { + $admin_email = get_option( 'admin_email' ); + } ?>

diff --git a/wp-includes/version.php b/wp-includes/version.php index d4be552115..ac74ceb004 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38322'; +$wp_version = '4.7-alpha-38323'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.