diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index e20b89ae5..fbc28e450 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -167,7 +167,7 @@ switch ( $_GET['action'] ) {
wp_die( __( 'Invalid email address.' ) );
if ( is_subdomain_install() ) {
- $newdomain = $domain . '.' . $current_site->domain;
+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
$path = $base;
} else {
$newdomain = $current_site->domain;
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 989d2c121..157604674 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -714,7 +714,7 @@ switch ( $action ) {
|
- .domain;?>
+ .domain );?>
domain . $current_site->path ?>
' . $current_site->domain . $current_site->path . ' ';
else
- echo '.' . $current_site->domain . ' ';
+ echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . ' ';
if ( !is_user_logged_in() ) {
print '(' . __( 'Your address will be ' );
if ( !is_subdomain_install() )
print $current_site->domain . $current_site->path . __( 'sitename' );
else
- print __( 'domain.' ) . $current_site->domain . $current_site->path;
- echo '.) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '';
+ print __( 'domain.' ) . $site_domain . $current_site->path;
+ echo '.) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '';
}
// Blog Title
|