Ticket #29974: 29974.3.patch

src/wp-includes/comment-template.php

@@ -2203 +2203 @@
                 /** 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( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</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 ) ) ) ) . '</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_after'  => '<p class="form-allowed-tags" id="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
                 'id_form'              => 'commentform',
@@ -2289 +2289 @@
                                                         ?>
                                                 <?php else : ?>
                                                         <?php echo $args['comment_notes_before']; ?>
+                                                <?php endif; ?>
+                                                <?php
+                                                /**
+                                                 * Filter the content of the comment textarea field for display.
+                                                 *
+                                                 * @since 3.0.0
+                                                 *
+                                                 * @param string $args_comment_field The content of the comment textarea field.
+                                                 */
+                                                echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
+                                                ?>
+                                                <?php echo $args['comment_notes_after']; ?>
+                                                <?php if ( ! is_user_logged_in() ) : ?>
                                                         <?php
                                                         /**
                                                          * Fires before the comment fields in the comment form.
@@ -2317 +2330 @@
                                                         do_action( 'comment_form_after_fields' );
                                                         ?>
                                                 <?php endif; ?>
-                                                <?php
-                                                /**
-                                                 * Filter the content of the comment textarea field for display.
-                                                 *
-                                                 * @since 3.0.0
-                                                 *
-                                                 * @param string $args_comment_field The content of the comment textarea field.
-                                                 */
-                                                echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
-                                                ?>
-                                                <?php echo $args['comment_notes_after']; ?>
                                                 <p class="form-submit">
                                                         <input name="<?php echo esc_attr( $args['name_submit'] ); ?>" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" class="<?php echo esc_attr( $args['class_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
                                                         <?php comment_id_fields( $post_id ); ?>