Changeset 40667

Timestamp:

05/14/2017 04:19:51 AM (7 years ago)

Author:

rachelbaker

Message:

Formatting: Increase minimum characters allowed in is_email() to 6.

Brings the minimum characters expected for a valid email address to six, which matches the expectations in wp_handle_comment_submission() and REST API email arguments.

Props rmccue, lukecavanagh, rachelbaker, desrosj, sudar.
Fixes #38708.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (2 diffs)
• src/wp-includes/rest-api.php (modified) (1 diff)
• tests/phpunit/tests/formatting/IsEmail.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -3066 +3066 @@
 
     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 ) ) {

trunk/src/wp-includes/formatting.php

@@ -2873 +2873 @@
 
     // Test for the minimum length the email can be
-    if ( strlen( $email ) < 3 ) {
+    if ( strlen( $email ) < 6 ) {
         /**
          * Filters whether an email address is valid.
@@ -3110 +3110 @@
 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.

trunk/src/wp-includes/rest-api.php

@@ -1078 +1078 @@
 
             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.' ) );
                 }

trunk/tests/phpunit/tests/formatting/IsEmail.php

@@ -10 +10 @@
             "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 ) {
@@ -23 +24 @@
             "sif i'd give u it, spamer!1",
             "com.exampleNOSPAMbob",
-            "bob@your mom"
+            "bob@your mom",
+            "a@b.c",
             );
         foreach ($data as $datum) {