WordPress 4.2.4-scripts

[autoinstalls/wordpress.git] / wp-includes / comment-template.php

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 7af2f3b1b1a1b90d333d32844d40bf3b29177421..c5e5c5f288a522a69ec91199f5b91da632c2e51d 100644 (file)
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2252,6 +2252,9 @@ function comment_form( $args = array(), $post_id = null ) {
         */
        $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
 
         */
        $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
 

+       // Ensure that the filtered args contain all required default values.
+       $args = array_merge( $defaults, $args );
+

                if ( comments_open( $post_id ) ) : ?>
                        <?php
                        /**
                if ( comments_open( $post_id ) ) : ?>
                        <?php
                        /**