Ticket #49277: 49277.diff

src/wp-includes/rest-api.php

@@ -966 +966 @@
         return strtotime( $date );
 }
 
+/**
+ * Sanitize email.
+ *
+ * @since 5.4.0
+ *
+ * @param string $email Email address
+ * @return string Valid email address.
+ */
+function rest_sanitize_email( $email ) {
+        $email = sanitize_text_field( $email );
+
+        return filter_var( $email, FILTER_SANITIZE_EMAIL );
+}
+
 /**
  * Parses a date into both its local and UTC equivalent, in MySQL datetime format.
  *
@@ -1477 +1491 @@
                                 /*
                                  * sanitize_email() validates, which would be unexpected.
                                  */
-                                return sanitize_text_field( $value );
+                                return rest_sanitize_email( $value );
 
                         case 'uri':
                                 return esc_url_raw( $value );

tests/phpunit/tests/rest-api/rest-schema-sanitization.php

@@ -62 +62 @@
                         'format' => 'email',
                 );
                 $this->assertEquals( 'email@example.com', rest_sanitize_value_from_schema( 'email@example.com', $schema ) );
+                $this->assertEquals( 'email@example.com', rest_sanitize_value_from_schema( 'email🙂@example.com', $schema ) );
+                $this->assertEquals( 'email@example.com', rest_sanitize_value_from_schema( '±email@example.com', $schema ) );
+                $this->assertEquals( 'email@example.com', rest_sanitize_value_from_schema( '(email@example.com)', $schema ) );
                 $this->assertEquals( 'a@b.c', rest_sanitize_value_from_schema( 'a@b.c', $schema ) );
                 $this->assertEquals( 'invalid', rest_sanitize_value_from_schema( 'invalid', $schema ) );
         }

tests/phpunit/tests/rest-api/rest-themes-controller.php

@@ -198 +198 @@
         /**
          * Should include relevant data in the 'theme_supports' key.
          *
+         *
          * @ticket 45016
          */
         public function test_theme_supports_formats() {