Changeset 52029

Timestamp:

11/07/2021 09:13:11 PM (5 years ago)

Author:

joedolson

Message:

Comments: Mark comment text field as required.

Add required asterisk to the comment text field. Historically, the name and email fields are marked as required, but the comment text field is not, though it is actually a required field.

Props infected, solarissmoke, rianrietveld, afercia, sabernhardt, strider72, mai21, audrasjb.
Fixes #16206.

Location:

trunk/src/wp-includes

Files:

• comment-template.php (modified) (10 diffs)
• comment.php (modified) (1 diff)

trunk/src/wp-includes/comment-template.php

@@ -2351 +2351 @@
         }
 
-        $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 = ' <span class="required" aria-hidden="true">*</span>';
 
         $fields = array(
@@ -2361 +2367 @@
                                 '<label for="author">%s%s</label>',
                                 __( 'Name' ),
-                                ( $req ? ' <span class="required">*</span>' : '' )
+                                ( $req ? $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 : '' )
                         )
                 ),
@@ -2374 +2380 @@
                                 '<label for="email">%s%s</label>',
                                 __( 'Email' ),
-                                ( $req ? ' <span class="required">*</span>' : '' )
+                                ( $req ? $required_indicator : '' )
                         ),
                         sprintf(
@@ -2380 +2386 @@
                                 ( $html5 ? 'type="email"' : 'type="text"' ),
                                 esc_attr( $commenter['comment_author_email'] ),
-                                $html_req
+                                ( $req ? $required_attribute : '' )
                         )
                 ),
@@ -2398 +2404 @@
 
         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(
@@ -2420 +2426 @@
         $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 )
         );
 
@@ -2438 +2444 @@
                         '<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(
@@ -2453 +2460 @@
                 ),
                 'logged_in_as'         => sprintf(
-                        '<p class="logged-in-as">%s</p>',
+                        '<p class="logged-in-as">%s%s</p>',
                         sprintf(
                                 /* translators: 1: Edit user link, 2: Accessibility text, 3: User name, 4: Logout URL. */
@@ -2463 +2470 @@
                                 /** This filter is documented in wp-includes/link-template.php */
                                 wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
-                        )
+                        ),
+                        $required_text
                 ),
                 'comment_notes_before' => sprintf(
@@ -2471 +2479 @@
                                 __( 'Your email address will not be published.' )
                         ),
-                        ( $req ? $required_text : '' )
+                        $required_text
                 ),
                 'comment_notes_after'  => '',

trunk/src/wp-includes/comment.php

@@ -3550 +3550 @@
         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 );