Ticket #17433: 17433-3.diff

src/wp-includes/formatting.php

@@ -2169 +2169 @@
         // Split the domain into subs
         $subs = explode( '.', $domain );
 
-        // Assume the domain will have at least two subs
-        if ( 2 > count( $subs ) ) {
+        // Assume the domain will have at least two subs, whitelist localhost
+        if ( 2 > count( $subs ) && 'localhost' !== strtolower( $domain ) ) {
                 /** This filter is documented in wp-includes/formatting.php */
                 return apply_filters( 'is_email', false, $email, 'domain_no_periods' );
         }
@@ -2421 +2421 @@
         // Split the domain into subs
         $subs = explode( '.', $domain );
 
-        // Assume the domain will have at least two subs
-        if ( 2 > count( $subs ) ) {
+        // Assume the domain will have at least two subs, whitelist localhost
+        if ( 2 > count( $subs ) && 'localhost' !== strtolower( $domain ) ) {
                 /** This filter is documented in wp-includes/formatting.php */
                 return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );
         }
@@ -2444 +2444 @@
                 }
         }
 
-        // If there aren't 2 or more valid subs
-        if ( 2 > count( $new_subs ) ) {
+        // If there aren't 2 or more valid subs, whitelist localhost
+        if ( 2 > count( $new_subs ) && 'localhost' !== strtolower( $domain ) ) {
                 /** This filter is documented in wp-includes/formatting.php */
                 return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );
         }

tests/phpunit/tests/formatting/IsEmail.php

@@ -9 +9 @@
                         "bob@example.com",
                         "phil@example.info",
                         "ace@204.32.222.14",
-                        "kevin@many.subdomains.make.a.happy.man.edu"
+                        "kevin@many.subdomains.make.a.happy.man.edu",
+                        "sal@localhost",
                         );
                 foreach ( $data as $datum ) {
                         $this->assertEquals( $datum, is_email( $datum ), $datum );

tests/phpunit/tests/formatting/SanitizeEmail.php

@@ +1 @@
+<?php
+
+/**
+ * @group formatting
+ */
+class Tests_Formatting_SanitizeEmail extends WP_UnitTestCase {
+        function test_returns_the_unmodified_email_address_if_it_is_valid() {
+                $data = array(
+                        "bob@example.com",
+                        "phil@example.info",
+                        "ace@204.32.222.14",
+                        "kevin@many.subdomains.make.a.happy.man.edu",
+                        "sal@localhost",
+                        );
+                foreach ( $data as $datum ) {
+                        $this->assertEquals( $datum, sanitize_email( $datum ), $datum );
+                }
+        }
+}