Ticket #39915: 39915.patch

src/wp-includes/ms-functions.php

@@ -441 +441 @@
                 $errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
         }
 
+        if ( ! is_email( $user_email ) ) {
+                $errors->add( 'user_email', __( 'Please enter a valid email address.' ) );
+        }
+
         if ( is_email_address_unsafe( $user_email ) )
                 $errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
 
@@ -455 +459 @@
         if ( preg_match( '/^[0-9]*$/', $user_name ) )
                 $errors->add('user_name', __('Sorry, usernames must have letters too!'));
 
-        if ( !is_email( $user_email ) )
-                $errors->add('user_email', __( 'Please enter a valid email address.' ) );
-
         $limited_email_domains = get_site_option( 'limited_email_domains' );
         if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
                 $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );