Ticket #35419: 35419-src.diff

wp-includes/comment-template.php

@@ -1323 +1323 @@
                                 'count'   => true,
                                 'orderby' => false,
                                 'post_id' => $post->ID,
-                                'parent'  => 0,
                                 'status'  => 'approve',
                         );
 
+                        if ( $comment_args['hierarchical'] ) {
+                                $top_level_args['parent'] = 0;
+                        }
+
                         if ( isset( $comment_args['include_unapproved'] ) ) {
                                 $top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
                         }