Ticket #16206: 16206.5.patch

src/wp-includes/comment-template.php

@@ -1241 +1241 @@
  * @global int        $user_ID
  * @global string     $user_identity
  * @global bool       $overridden_cpage
- * @global bool       $withcomments 
+ * @global bool       $withcomments
  *
  * @param string $file              Optional. The file to load. Default '/comments.php'.
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
@@ -2109 +2109 @@
         if ( ! isset( $args['format'] ) )
                 $args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
 
-        $req      = get_option( 'require_name_email' );
-        $aria_req = ( $req ? " aria-required='true'" : '' );
-        $html_req = ( $req ? " required='required'" : '' );
-        $html5    = 'html5' === $args['format'];
-        $fields   =  array(
-                'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-                            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
-                'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-                            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+        $required_option      = get_option( 'require_name_email' );
+        $html5                = 'html5' === $args['format'];
+        $aria_required_attr   = ( $required_option ? ' aria-required="true"' : '' );
+        $required_attr_always = ( $html5 ? ' required' : ' required="required"' );
+        $required_attr        = ( $required_option ? $required_attr_always : '' );
+
+        $fields = array(
+                'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $required_option ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+                            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_required_attr . $required_attr . ' /></p>',
+                'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $required_option ? ' <span class="required">*</span>' : '' ) . '</label> ' .
+                            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_required_attr . $required_attr  . ' /></p>',
                 'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
                             '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
         );
 
-        $required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+        $required_text = ' <span class="comment-required-message">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</span>';
 
         /**
          * Filter the default comment form fields.
@@ -2134 +2136 @@
         $fields = apply_filters( 'comment_form_default_fields', $fields );
         $defaults = array(
                 'fields'               => $fields,
-                'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
+                'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . ' <span class="required">*</span></label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true"' . $required_attr_always . '></textarea></p>',
                 /** This filter is documented in wp-includes/link-template.php */
                 'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
                 /** This filter is documented in wp-includes/link-template.php */
-                'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( '<a href="%1$s" aria-label="Logged in as %2$s. Edit your profile.">Logged in as %2$s</a>. <a href="%3$s">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-                'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+                'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( '<a href="%1$s" aria-label="Logged in as %2$s. Edit your profile.">Logged in as %2$s</a>. <a href="%3$s">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . $required_text . '</p>',
+                'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>' . $required_text . '</p>',
                 'comment_notes_after'  => '',
                 'id_form'              => 'commentform',
                 'id_submit'            => 'submit',
@@ -2215 +2217 @@
                                         do_action( 'comment_form_top' );
 
                                         if ( is_user_logged_in() ) :
+
                                                 /**
                                                  * Filter the 'logged in' message for the comment form for display.
                                                  *

src/wp-includes/comment.php

@@ -2827 +2827 @@
 
         if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
                 if ( 6 > strlen( $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 );
                 }