From 1ffba4abc4b6cd8594ce8d4fe30b1e3e0b76de2a Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Sun, 12 Oct 2014 00:22:18 +0000
Subject: [PATCH] Differentiate between invalid and missing admin emails when
 adding a new site

Check the emptiness of the admin email before using `sanitize_email()` and `is_email()` to determine if the address is valid.

Fixes #17890

Built from https://develop.svn.wordpress.org/trunk@29877


git-svn-id: http://core.svn.wordpress.org/trunk@29634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-new.php | 10 +++++++---
 wp-includes/version.php       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

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: <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 );
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.