Ticket #16576: 16576.diff

src/wp-includes/comment-template.php

@@ -2282 +2282 @@
                                                         ?>
                                                 <?php else : ?>
                                                         <?php echo $args['comment_notes_before']; ?>
-                                                        <?php
+                                                <?php endif; ?>
+                                                <?php
+                                                /**
+                                                 * Fires before the comment fields in the comment form.
+                                                 *
+                                                 * @since 3.0.0
+                                                 */
+                                                do_action( 'comment_form_before_fields' );
+                                                foreach ( (array) $args['fields'] as $name => $field ) {
                                                         /**
-                                                         * Fires before the comment fields in the comment form.
-                                                         *
-                                                         * @since 3.0.0
+                                                         * Do not display the default fields for logged in users.
                                                          */
-                                                        do_action( 'comment_form_before_fields' );
-                                                        foreach ( (array) $args['fields'] as $name => $field ) {
-                                                                /**
-                                                                 * Filter a comment form field for display.
-                                                                 *
-                                                                 * The dynamic portion of the filter hook, $name, refers to the name
-                                                                 * of the comment form field. Such as 'author', 'email', or 'url'.
-                                                                 *
-                                                                 * @since 3.0.0
-                                                                 *
-                                                                 * @param string $field The HTML-formatted output of the comment form field.
-                                                                 */
-                                                                echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
-                                                        }
+                                                        if ( is_user_logged_in() && in_array( $name, array( 'author', 'email', 'url' ) ) )
+                                                                continue;
                                                         /**
-                                                         * Fires after the comment fields in the comment form.
+                                                         * Filter a comment form field for display.
+                                                         *
+                                                         * The dynamic portion of the filter hook, $name, refers to the name
+                                                         * of the comment form field. Such as 'author', 'email', or 'url'.
                                                          *
                                                          * @since 3.0.0
+                                                         *
+                                                         * @param string $field The HTML-formatted output of the comment form field.
                                                          */
-                                                        do_action( 'comment_form_after_fields' );
-                                                        ?>
-                                                <?php endif; ?>
+                                                        echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+                                                }
+                                                /**
+                                                 * Fires after the comment fields in the comment form.
+                                                 *
+                                                 * @since 3.0.0
+                                                 */
+                                                do_action( 'comment_form_after_fields' );
+                                                ?>
                                                 <?php
                                                 /**
                                                  * Filter the content of the comment textarea field for display.