diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index d8024400d5..1a0e6c4450 100644 --- 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: %s' ), implode( ', ', $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 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 37c7392d1d..1f42aaeaaf 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-20141011'; +$wp_version = '4.1-alpha-20141012'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.