Ticket #39915: 39915.2.diff

src/wp-includes/ms-functions.php

@@ -354 +354 @@
 
         $is_email_address_unsafe = false;
 
-        if ( $banned_names && is_array( $banned_names ) ) {
+        if ( $banned_names && is_array( $banned_names ) && false !== strpos( $user_email, '@', 1 ) ) {
                 $banned_names = array_map( 'strtolower', $banned_names );
                 $normalized_email = strtolower( $user_email );
 

tests/phpunit/tests/multisite/isEmailAddressUnsafe.php

@@ -120 +120 @@
                         ),
                 );
         }
+
+        public function test_email_with_only_top_level_domain_returns_safe() {
+                update_site_option( 'banned_email_domains', 'bar.com' );
+                $safe = is_email_address_unsafe( 'email@localhost' );
+                delete_site_option( 'banned_email_domains' );
+
+                $this->assertFalse( $safe );
+        }
+
+        public function test_invalid_email_without_domain_returns_safe() {
+                update_site_option( 'banned_email_domains', 'bar.com' );
+                $safe = is_email_address_unsafe( 'invalid-email' );
+                delete_site_option( 'bar.com' );
+
+                $this->assertFalse( $safe );
+        }
 }
 
 endif;