Ticket #47975: 47975.diff

src/wp-includes/comment-template.php

@@ -2439 +2439 @@
                                 $comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
 
                                 /**
+                                 * Check for the appearance of valid and non empty #email-notes
+                                 * in the comment_notes_before to remove aria-describedby in the
+                                 * email field.
+                                 *
+                                 * @since 5.3.0
+                                 */
+                                $regex = '/<([\w\d]+)\b([^id\>]+)(id="email-notes")([^>]+)?>(\s+)?(?=[\d\w]+)[^\<\>]+<\/\1>/m';
+                                if( 0 === preg_match( $regex, $args['comment_notes_before'] ) ) {
+                                        $comment_fields['email'] = str_replace(
+                                                ' aria-describedby="email-notes"',
+                                                '',
+                                                $comment_fields['email']
+                                        );
+                                }
+
+                                /**
                                  * Filters the comment form fields, including the textarea.
                                  *
                                  * @since 4.4.0