Changeset 15050

Timestamp:

05/29/2010 12:32:10 AM (12 years ago)

Author:

wpmuguru

Message:

strip www before adding subdomain when creating new site

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-admin/ms-sites.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-signup.php (modified) (2 diffs)

trunk/wp-admin/ms-edit.php

@@ -168 +168 @@
 
         if ( is_subdomain_install() ) {
-            $newdomain = $domain . '.' . $current_site->domain;
+            $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
             $path = $base;
         } else {

trunk/wp-admin/ms-sites.php

@@ -715 +715 @@
                         <td>
                         <?php if ( is_subdomain_install() ) { ?>
-                            <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo $current_site->domain;?>
+                            <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
                         <?php } else {
                             echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php _e( 'Domain' ) ?>"/>

trunk/wp-includes/ms-functions.php

@@ -598 +598 @@
     // Check if the domain/path has been used already.
     if ( is_subdomain_install() ) {
-        $mydomain = "$blogname.$domain";
+        $mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
         $path = $base;
     } else {

trunk/wp-signup.php

@@ -79 +79 @@
         echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
     else
-        echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . '</span><br />';
+        echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
 
     if ( !is_user_logged_in() ) {
@@ -86 +86 @@
             print $current_site->domain . $current_site->path . __( 'sitename' );
         else
-            print __( 'domain.' ) . $current_site->domain . $current_site->path;
-        echo '.)</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+            print __( 'domain.' ) . $site_domain . $current_site->path;
+        echo '.</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
     }