Ticket #21994: 21994.diff

src/wp-admin/network/site-new.php

@@ -60 +60 @@
                 wp_die( __( 'Invalid email address.' ) );
 
         if ( is_subdomain_install() ) {
+                if ( strlen( $domain ) > 63 ) {
+                        wp_die( __( 'Subdomain labels must be 63 characters or less.' ) );
+                }
+
                 $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
+                if ( strlen( $newdomain ) > 255 ) {
+                        wp_die( __( 'A full domain name is limited to 255 characters (including the separators).' ) );
+                }
+
                 $path      = $current_site->path;
         } else {
                 $newdomain = $current_site->domain;
@@ -126 +134 @@
                         <th scope="row"><?php _e( 'Site Address' ) ?></th>
                         <td>
                         <?php if ( is_subdomain_install() ) { ?>
-                                <input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+                                <input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>" maxlength="63" /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
                         <?php } else {
                                 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
                         <?php }