Changes in trunk/wp-signup.php [14898:15235]

File:

• trunk/wp-signup.php (modified) (7 diffs)

trunk/wp-signup.php

@@ -77 +77 @@
 
     if ( !is_subdomain_install() )
-        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 />';
+        echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><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="60" /><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>';
     }
 
@@ -96 +96 @@
         <p class="error"><?php echo $errmsg ?></p>
     <?php }
-    echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" /></p>';
+    echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
     ?>
 
@@ -103 +103 @@
             <label for="blog_public_on"><?php _e('Privacy:') ?></label>
             <?php _e('Allow my site to appear in search engines like Google, Technorati, and in public listings around this network.'); ?>
-            <div style="clear:both;"></div>
+            <br style="clear:both" />
             <label class="checkbox" for="blog_public_on">
                 <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
@@ -133 +133 @@
         echo '<p class="error">'.$errmsg.'</p>';
     }
-    echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />';
+    echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="60" /><br />';
     _e( '(Must be at least 4 characters, letters and numbers only.)' );
     ?>
@@ -177 +177 @@
     $blogs = get_blogs_of_user($current_user->ID);
     if ( !empty($blogs) ) { ?>
-        <p>
-            <?php _e( 'Sites you are already a member of:' ) ?>
+
+            <p><?php _e( 'Sites you are already a member of:' ) ?></p>
             <ul>
                 <?php foreach ( $blogs as $blog ) {
@@ -185 +185 @@
                 } ?>
             </ul>
-        </p>
     <?php } ?>