Changeset 29877

Timestamp:

10/12/2014 12:21:02 AM (10 years ago)

Author:

jeremyfelt

Message:

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

File:

• trunk/src/wp-admin/network/site-new.php (modified) (1 diff)

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

@@ -50 +50 @@
     }
 
-    $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() ) {