Ticket #38708: 38708.patch

src/wp-includes/comment.php

@@ -3005 +3005 @@
                  * @param int $comment_post_ID Post ID.
                  */
                 do_action( 'comment_on_draft', $comment_post_ID );
-                
+
                 if ( current_user_can( 'read_post', $comment_post_ID ) ) {
                         return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
                 } else {
@@ -3065 +3065 @@
         $comment_type = '';
 
         if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
-                if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
+                if ( '' == $comment_author_email || '' == $comment_author ) {
                         return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
                 } elseif ( ! is_email( $comment_author_email ) ) {
                         return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );

src/wp-includes/formatting.php

@@ -2872 +2872 @@
                 _deprecated_argument( __FUNCTION__, '3.0.0' );
 
         // Test for the minimum length the email can be
-        if ( strlen( $email ) < 3 ) {
+        if ( strlen( $email ) < 6 ) {
                 /**
                  * Filters whether an email address is valid.
                  *
@@ -3109 +3109 @@
  */
 function sanitize_email( $email ) {
         // Test for the minimum length the email can be
-        if ( strlen( $email ) < 3 ) {
+        if ( strlen( $email ) < 6 ) {
                 /**
                  * Filters a sanitized email address.
                  *

src/wp-includes/rest-api.php

@@ -1077 +1077 @@
                                 break;
 
                         case 'email' :
-                                // is_email() checks for 3 characters (a@b), but
-                                // wp_handle_comment_submission() requires 6 characters (a@b.co)
-                                //
-                                // https://core.trac.wordpress.org/ticket/38506
-                                if ( ! is_email( $value ) || strlen( $value ) < 6 ) {
+                                if ( ! is_email( $value ) ) {
                                         return new WP_Error( 'rest_invalid_email', __( 'Invalid email address.' ) );
                                 }
                                 break;

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",
+                        "a@b.co",
                         );
                 foreach ( $data as $datum ) {
                         $this->assertEquals( $datum, is_email( $datum ), $datum );
@@ -22 +23 @@
                         'http://bob.example.com/',
                         "sif i'd give u it, spamer!1",
                         "com.exampleNOSPAMbob",
-                        "bob@your mom"
+                        "bob@your mom",
+                        "a@b.c",
                         );
                 foreach ($data as $datum) {
                         $this->assertFalse(is_email($datum), $datum);