diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index 08733f85fd..5e7e620a01 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -68,8 +68,8 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) { // On the network's main site, don't allow the domain or path to change. $blog_data['domain'] = $details->domain; $blog_data['path'] = $details->path; - } elseif ( is_subdomain_install() ) { - // All parts of a URL can be updated for a subdomain configuration. We first + } else { + // For any other site, the scheme, domain, and path can all be changed. We first // need to ensure a scheme has been provided, otherwise fallback to the existing. $new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME ); @@ -81,9 +81,6 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) { $blog_data['scheme'] = $update_parsed_url['scheme']; $blog_data['domain'] = $update_parsed_url['host']; $blog_data['path'] = $update_parsed_url['path']; - } else { - // Only the path can be updated for a subdirectory configuration, so capture existing domain. - $blog_data['domain'] = $details->domain; } $existing_details = get_blog_details( $id, false ); @@ -174,26 +171,12 @@ if ( ! empty( $messages ) ) { siteurl ); ?> + // For any other site, the scheme, domain, and path can all be changed. + else : ?> - - - - domain ); ?> - - - - -
- - diff --git a/wp-includes/version.php b/wp-includes/version.php index 4e2e30cb08..f1531db02e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-RC2-33585'; +$wp_version = '4.3-RC2-33586'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.