Ticket #16206: 16206.8.patch

src/wp-includes/comment-template.php

@@ -2350 +2350 @@
                 $args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
         }
 
-        $req      = get_option( 'require_name_email' );
-        $html_req = ( $req ? " required='required'" : '' );
-        $html5    = 'html5' === $args['format'];
+        $req   = get_option( 'require_name_email' );
+        $html5 = 'html5' === $args['format'];
 
+        // Define attributes in HTML5 or XHTML syntax.
+        $required_attribute = ( $html5 ? ' required' : ' required="required"' );
+        $checked_attribute  = ( $html5 ? ' checked' : ' checked="checked"' );
+
+        // Identify required fields visually.
+        $required_indicator = ( $req ? ' <span class="required" aria-hidden="true">*</span>' : '' );
+
         $fields = array(
                 'author' => sprintf(
                         '<p class="comment-form-author">%s %s</p>',
@@ -2360 +2366 @@
                         sprintf(
                                 '<label for="author">%s%s</label>',
                                 __( 'Name' ),
-                                ( $req ? ' <span class="required">*</span>' : '' )
+                                $required_indicator
                         ),
                         sprintf(
                                 '<input id="author" name="author" type="text" value="%s" size="30" maxlength="245"%s />',
                                 esc_attr( $commenter['comment_author'] ),
-                                $html_req
+                                ( $req ? $required_attribute : '' )
                         )
                 ),
                 'email'  => sprintf(
@@ -2373 +2379 @@
                         sprintf(
                                 '<label for="email">%s%s</label>',
                                 __( 'Email' ),
-                                ( $req ? ' <span class="required">*</span>' : '' )
+                                $required_indicator
                         ),
                         sprintf(
                                 '<input id="email" name="email" %s value="%s" size="30" maxlength="100" aria-describedby="email-notes"%s />',
                                 ( $html5 ? 'type="email"' : 'type="text"' ),
                                 esc_attr( $commenter['comment_author_email'] ),
-                                $html_req
+                                ( $req ? $required_attribute : '' )
                         )
                 ),
                 'url'    => sprintf(
@@ -2397 +2403 @@
         );
 
         if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
-                $consent = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
+                $consent = empty( $commenter['comment_author_email'] ) ? '' : $checked_attribute;
 
                 $fields['cookies'] = sprintf(
                         '<p class="comment-form-cookies-consent">%s %s</p>',
@@ -2419 +2425 @@
 
         $required_text = sprintf(
                 /* translators: %s: Asterisk symbol (*). */
-                ' ' . __( 'Required fields are marked %s' ),
-                '<span class="required">*</span>'
+                ' <span class="comment-required-message" aria-hidden="true">' . __( 'Required fields are marked %s' ) . '</span>',
+                trim( $required_indicator )
         );
 
         /**
@@ -2437 +2443 @@
                 'comment_field'        => sprintf(
                         '<p class="comment-form-comment">%s %s</p>',
                         sprintf(
-                                '<label for="comment">%s</label>',
-                                _x( 'Comment', 'noun' )
+                                '<label for="comment">%s%s</label>',
+                                _x( 'Comment', 'noun' ),
+                                $required_indicator
                         ),
-                        '<textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" required="required"></textarea>'
+                        '<textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525"' . $required_attribute . '></textarea>'
                 ),
                 'must_log_in'          => sprintf(
                         '<p class="must-log-in">%s</p>',

src/wp-includes/comment.php

@@ -3549 +3549 @@
 
         if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
                 if ( '' == $comment_author_email || '' == $comment_author ) {
-                        return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 );
+                        return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields.' ), 200 );
                 } elseif ( ! is_email( $comment_author_email ) ) {
                         return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
                 }