Ticket #16206: 16206.3.patch

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.
@@ -2111 +2111 @@
 
         $req      = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );
-        $html_req = ( $req ? " required='required'" : '' );
+        $html_req = ( $req ? " required" : '' );
         $html5    = 'html5' === $args['format'];
         $fields   =  array(
                 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
@@ -2134 +2134 @@
         $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></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>',
+                'comment_notes_logged_in_before' => '<p class="comment-notes">'. $required_text . '</p>',
                 'comment_notes_after'  => '',
                 'id_form'              => 'commentform',
                 'id_submit'            => 'submit',
@@ -2215 +2216 @@
                                         do_action( 'comment_form_top' );
 
                                         if ( is_user_logged_in() ) :
+
                                                 /**
                                                  * Filter the 'logged in' message for the comment form for display.
                                                  *
@@ -2228 +2230 @@
                                                  */
                                                 echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
 
+                                                echo $args['comment_notes_logged_in_before'];
+
                                                 /**
                                                  * Fires after the is_user_logged_in() check in the comment form.
                                                  *