Ticket #24064: 24064.patch

wp-includes/comment-template.php

@@ -1635 +1635 @@
                 'cancel_reply_link'    => __( 'Cancel reply' ),
                 'label_submit'         => __( 'Post Comment' ),
                 'format'               => 'xhtml',
+                'comment_field_first'  => false,
         );
 
         $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
@@ -1650 +1651 @@
                                 <?php else : ?>
                                         <form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
                                                 <?php do_action( 'comment_form_top' ); ?>
+                                                <?php if ( $args['comment_field_first'] ) : ?>
+                                                        <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
+                                                        <?php echo $args['comment_notes_after']; ?>
+                                                <?php endif; ?>
                                                 <?php if ( is_user_logged_in() ) : ?>
                                                         <?php echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity ); ?>
                                                         <?php do_action( 'comment_form_logged_in_after', $commenter, $user_identity ); ?>
@@ -1663 +1668 @@
                                                         do_action( 'comment_form_after_fields' );
                                                         ?>
                                                 <?php endif; ?>
-                                                <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
-                                                <?php echo $args['comment_notes_after']; ?>
+                                                <?php if ( !$args['comment_field_first'] ) : ?>
+                                                        <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
+                                                        <?php echo $args['comment_notes_after']; ?>
+                                                <?php endif; ?>
                                                 <p class="form-submit">
                                                         <input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
                                                         <?php comment_id_fields( $post_id ); ?>