Changeset 38959

Timestamp:

10/26/2016 02:47:09 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Comments: In comment_form(), bail early if comments for the post are closed.

Props jipmoors.
Fixes #38514.

File:

• trunk/src/wp-includes/comment-template.php (modified) (2 diffs)

trunk/src/wp-includes/comment-template.php

@@ -2167 +2167 @@
     if ( null === $post_id )
         $post_id = get_the_ID();
+
+    // Exit the function when comments for the post are closed.
+    if ( ! comments_open( $post_id ) ) {
+        /**
+         * Fires after the comment form if comments are closed.
+         *
+         * @since 3.0.0
+         */
+        do_action( 'comment_form_comments_closed' );
+
+        return;
+    }
 
     $commenter = wp_get_current_commenter();
@@ -2253 +2265 @@
     $args = array_merge( $defaults, $args );
 
-    if ( comments_open( $post_id ) ) : ?>
+    /**
+     * Fires before the comment form.
+     *
+     * @since 3.0.0
+     */
+    do_action( 'comment_form_before' );
+    ?>
+    <div id="respond" class="comment-respond">
         <?php
-        /**
-         * Fires before the comment form.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'comment_form_before' );
-        ?>
-        <div id="respond" class="comment-respond">
-            <?php
-            echo $args['title_reply_before'];
-
-            comment_form_title( $args['title_reply'], $args['title_reply_to'] );
-
-            echo $args['cancel_reply_before'];
-
-            cancel_comment_reply_link( $args['cancel_reply_link'] );
-
-            echo $args['cancel_reply_after'];
-
-            echo $args['title_reply_after'];
-
-            if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
-                echo $args['must_log_in'];
+        echo $args['title_reply_before'];
+
+        comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+
+        echo $args['cancel_reply_before'];
+
+        cancel_comment_reply_link( $args['cancel_reply_link'] );
+
+        echo $args['cancel_reply_after'];
+
+        echo $args['title_reply_after'];
+
+        if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+            echo $args['must_log_in'];
+            /**
+             * Fires after the HTML-formatted 'must log in after' message in the comment form.
+             *
+             * @since 3.0.0
+             */
+            do_action( 'comment_form_must_log_in_after' );
+        else : ?>
+            <form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+                <?php
                 /**
-                 * Fires after the HTML-formatted 'must log in after' message in the comment form.
+                 * Fires at the top of the comment form, inside the form tag.
                  *
                  * @since 3.0.0
                  */
-                do_action( 'comment_form_must_log_in_after' );
-            else : ?>
-                <form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
-                    <?php
+                do_action( 'comment_form_top' );
+
+                if ( is_user_logged_in() ) :
                     /**
-                     * Fires at the top of the comment form, inside the form tag.
+                     * Filters the 'logged in' message for the comment form for display.
                      *
                      * @since 3.0.0
+                     *
+                     * @param string $args_logged_in The logged-in-as HTML-formatted message.
+                     * @param array  $commenter      An array containing the comment author's
+                     *                               username, email, and URL.
+                     * @param string $user_identity  If the commenter is a registered user,
+                     *                               the display name, blank otherwise.
                      */
-                    do_action( 'comment_form_top' );
-
-                    if ( is_user_logged_in() ) :
+                    echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+
+                    /**
+                     * Fires after the is_user_logged_in() check in the comment form.
+                     *
+                     * @since 3.0.0
+                     *
+                     * @param array  $commenter     An array containing the comment author's
+                     *                              username, email, and URL.
+                     * @param string $user_identity If the commenter is a registered user,
+                     *                              the display name, blank otherwise.
+                     */
+                    do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+
+                else :
+
+                    echo $args['comment_notes_before'];
+
+                endif;
+
+                // Prepare an array of all fields, including the textarea
+                $comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
+
+                /**
+                 * Filters the comment form fields, including the textarea.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param array $comment_fields The comment fields.
+                 */
+                $comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
+
+                // Get an array of field names, excluding the textarea
+                $comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
+
+                // Get the first and the last field name, excluding the textarea
+                $first_field = reset( $comment_field_keys );
+                $last_field  = end( $comment_field_keys );
+
+                foreach ( $comment_fields as $name => $field ) {
+
+                    if ( 'comment' === $name ) {
+
                         /**
-                         * Filters the 'logged in' message for the comment form for display.
+                         * Filters the content of the comment textarea field for display.
                          *
                          * @since 3.0.0
                          *
-                         * @param string $args_logged_in The logged-in-as HTML-formatted message.
-                         * @param array  $commenter      An array containing the comment author's
-                         *                               username, email, and URL.
-                         * @param string $user_identity  If the commenter is a registered user,
-                         *                               the display name, blank otherwise.
+                         * @param string $args_comment_field The content of the comment textarea field.
                          */
-                        echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+                        echo apply_filters( 'comment_form_field_comment', $field );
+
+                        echo $args['comment_notes_after'];
+
+                    } elseif ( ! is_user_logged_in() ) {
+
+                        if ( $first_field === $name ) {
+                            /**
+                             * Fires before the comment fields in the comment form, excluding the textarea.
+                             *
+                             * @since 3.0.0
+                             */
+                            do_action( 'comment_form_before_fields' );
+                        }
 
                         /**
-                         * Fires after the is_user_logged_in() check in the comment form.
+                         * Filters 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 array  $commenter     An array containing the comment author's
-                         *                              username, email, and URL.
-                         * @param string $user_identity If the commenter is a registered user,
-                         *                              the display name, blank otherwise.
+                         * @param string $field The HTML-formatted output of the comment form field.
                          */
-                        do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
-
-                    else :
-
-                        echo $args['comment_notes_before'];
-
-                    endif;
-
-                    // Prepare an array of all fields, including the textarea
-                    $comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
-
-                    /**
-                     * Filters the comment form fields, including the textarea.
-                     *
-                     * @since 4.4.0
-                     *
-                     * @param array $comment_fields The comment fields.
-                     */
-                    $comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
-
-                    // Get an array of field names, excluding the textarea
-                    $comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
-
-                    // Get the first and the last field name, excluding the textarea
-                    $first_field = reset( $comment_field_keys );
-                    $last_field  = end( $comment_field_keys );
-
-                    foreach ( $comment_fields as $name => $field ) {
-
-                        if ( 'comment' === $name ) {
-
+                        echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+
+                        if ( $last_field === $name ) {
                             /**
-                             * Filters the content of the comment textarea field for display.
+                             * Fires after the comment fields in the comment form, excluding the textarea.
                              *
                              * @since 3.0.0
-                             *
-                             * @param string $args_comment_field The content of the comment textarea field.
                              */
-                            echo apply_filters( 'comment_form_field_comment', $field );
-
-                            echo $args['comment_notes_after'];
-
-                        } elseif ( ! is_user_logged_in() ) {
-
-                            if ( $first_field === $name ) {
-                                /**
-                                 * Fires before the comment fields in the comment form, excluding the textarea.
-                                 *
-                                 * @since 3.0.0
-                                 */
-                                do_action( 'comment_form_before_fields' );
-                            }
-
-                            /**
-                             * Filters 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 ( $last_field === $name ) {
-                                /**
-                                 * Fires after the comment fields in the comment form, excluding the textarea.
-                                 *
-                                 * @since 3.0.0
-                                 */
-                                do_action( 'comment_form_after_fields' );
-                            }
+                            do_action( 'comment_form_after_fields' );
                         }
                     }
-
-                    $submit_button = sprintf(
-                        $args['submit_button'],
-                        esc_attr( $args['name_submit'] ),
-                        esc_attr( $args['id_submit'] ),
-                        esc_attr( $args['class_submit'] ),
-                        esc_attr( $args['label_submit'] )
-                    );
-
-                    /**
-                     * Filters the submit button for the comment form to display.
-                     *
-                     * @since 4.2.0
-                     *
-                     * @param string $submit_button HTML markup for the submit button.
-                     * @param array  $args          Arguments passed to `comment_form()`.
-                     */
-                    $submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
-
-                    $submit_field = sprintf(
-                        $args['submit_field'],
-                        $submit_button,
-                        get_comment_id_fields( $post_id )
-                    );
-
-                    /**
-                     * Filters the submit field for the comment form to display.
-                     *
-                     * The submit field includes the submit button, hidden fields for the
-                     * comment form, and any wrapper markup.
-                     *
-                     * @since 4.2.0
-                     *
-                     * @param string $submit_field HTML markup for the submit field.
-                     * @param array  $args         Arguments passed to comment_form().
-                     */
-                    echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
-
-                    /**
-                     * Fires at the bottom of the comment form, inside the closing </form> tag.
-                     *
-                     * @since 1.5.0
-                     *
-                     * @param int $post_id The post ID.
-                     */
-                    do_action( 'comment_form', $post_id );
-                    ?>
-                </form>
-            <?php endif; ?>
-        </div><!-- #respond -->
-        <?php
-        /**
-         * Fires after the comment form.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'comment_form_after' );
-    else :
-        /**
-         * Fires after the comment form if comments are closed.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'comment_form_comments_closed' );
-    endif;
-}
+                }
+
+                $submit_button = sprintf(
+                    $args['submit_button'],
+                    esc_attr( $args['name_submit'] ),
+                    esc_attr( $args['id_submit'] ),
+                    esc_attr( $args['class_submit'] ),
+                    esc_attr( $args['label_submit'] )
+                );
+
+                /**
+                 * Filters the submit button for the comment form to display.
+                 *
+                 * @since 4.2.0
+                 *
+                 * @param string $submit_button HTML markup for the submit button.
+                 * @param array  $args          Arguments passed to `comment_form()`.
+                 */
+                $submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+
+                $submit_field = sprintf(
+                    $args['submit_field'],
+                    $submit_button,
+                    get_comment_id_fields( $post_id )
+                );
+
+                /**
+                 * Filters the submit field for the comment form to display.
+                 *
+                 * The submit field includes the submit button, hidden fields for the
+                 * comment form, and any wrapper markup.
+                 *
+                 * @since 4.2.0
+                 *
+                 * @param string $submit_field HTML markup for the submit field.
+                 * @param array  $args         Arguments passed to comment_form().
+                 */
+                echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+
+                /**
+                 * Fires at the bottom of the comment form, inside the closing </form> tag.
+                 *
+                 * @since 1.5.0
+                 *
+                 * @param int $post_id The post ID.
+                 */
+                do_action( 'comment_form', $post_id );
+                ?>
+            </form>
+        <?php endif; ?>
+    </div><!-- #respond -->
+    <?php
+
+    /**
+     * Fires after the comment form.
+     *
+     * @since 3.0.0
+     */
+    do_action( 'comment_form_after' );
+}