WordPress 4.1-scripts

[autoinstalls/wordpress.git] / wp-admin / network / site-new.php

diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index d8024400d5abc3139ab005011ff451dec89120c5..1c3f6f34a753eee0fce062c43516d0e6197cb27b 100644 (file)
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -49,15 +49,19 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
                        wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
        }
 
-       $email = sanitize_email( $blog['email'] );
        $title = $blog['title'];
 
        if ( empty( $domain ) )
                wp_die( __( 'Missing or invalid site address.' ) );
-       if ( empty( $email ) )
+
+       if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
                wp_die( __( 'Missing email address.' ) );
-       if ( !is_email( $email ) )
+       }
+
+       $email = sanitize_email( $blog['email'] );
+       if ( ! is_email( $email ) ) {
                wp_die( __( 'Invalid email address.' ) );
+       }
 
        if ( is_subdomain_install() ) {
                $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
@@ -126,9 +130,9 @@ if ( ! empty( $messages ) ) {
                        <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" id="site-address" title="<?php esc_attr_e( 'Domain' ) ?>"/><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' ) ?>"/>
+                               echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" id="site-address" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
                        <?php }
                        echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
                        ?>
@@ -136,11 +140,11 @@ if ( ! empty( $messages ) ) {
                </tr>
                <tr class="form-field form-required">
                        <th scope="row"><?php _e( 'Site Title' ) ?></th>
-                       <td><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
+                       <td><input name="blog[title]" type="text" class="regular-text" id="site-title" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
                </tr>
                <tr class="form-field form-required">
                        <th scope="row"><?php _e( 'Admin Email' ) ?></th>
-                       <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
+                       <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
                </tr>
                <tr class="form-field">
                        <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>