Ticket #47975: 47975.4.diff

src/wp-includes/comment-template.php

@@ -2512 +2512 @@
                         // Prepare an array of all fields, including the textarea
                         $comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
 
+                        /**
+                         * Check for the presence of id="email-notes" in the
+                         * comment_notes_before to remove aria-describedby in the
+                         * email field.
+                         * 
+                         * @since 5.3.0
+                         */
+                        if( false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
+                                $comment_fields['email'] = str_replace(
+                                        ' aria-describedby="email-notes"',
+                                        '',
+                                        $comment_fields['email']
+                                );
+                        }
+
                         /**
                          * Filters the comment form fields, including the textarea.
                          *

tests/phpunit/tests/comment/commentForm.php

@@ -100 +100 @@
 
                 $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
         }
+
+        /**
+         * aria-describedby="email-notes" should not be displayed if no email notes in `comment_form()`.
+         * 
+         * @ticket 47975
+         */
+        public function test_aria_describedby_email_notes() {
+                $p = self::factory()->post->create();
+
+                $comment_form_with_aria = get_echo( 'comment_form', array( array(), $p ) );
+                $with_aria = strpos( $comment_form_with_aria, 'aria-describedby="email-notes"');
+                $this->assertNotFalse( $with_aria );
+
+                // Remove email notes.
+                add_filter( 'comment_form_defaults', array( $this, 'filter_remove_email_notes' ) );
+                $comment_form_without_aria = get_echo( 'comment_form', array( array(), $p ) );
+                $without_aria = strpos( $comment_form_without_aria, 'aria-describedby="email-notes"');
+                $this->assertFalse( $without_aria );
+        }
+
+        public function filter_remove_email_notes( $defaults ) {
+                $defaults['comment_notes_before'] = '';
+                return $defaults;
+        }
 }