Ticket #46963: 46963.2.patch

wp-admin/includes/meta-boxes.php

@@ -807 +807 @@
         <p class="hide-if-no-js" id="add-new-comment"><button type="button" class="button" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);"><?php _e( 'Add comment' ); ?></button></p>
         <?php
 
-        $total         = get_comments(
+        $wp_get_comments = get_comments(
                 array(
                         'post_id' => $post->ID,
                         'number'  => 1,
-                        'count'   => true,
                 )
         );
+
+        $total = get_comments_number( $post->ID );
+        if ( 0 !== count( $wp_get_comments ) ) {
+                // Get the comment type (comment, trackback),
+                $comment_type = ( ! empty( $wp_get_comments[0]->comment_type ) ) ? $wp_get_comments[0]->comment_type : 'comment';
+        }
         $wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table' );
         $wp_list_table->display( true );
 
@@ -828 +833 @@
                 }
 
                 ?>
-                <p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.load(<?php echo $total; ?>);return false;"><?php _e( 'Show comments' ); ?></a> <span class="spinner"></span></p>
+                <p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.load(<?php echo $total; ?>,'<?php echo $comment_type; ?>');return false;"><?php _e( 'Show comments' ); ?></a> <span class="spinner"></span></p>
                 <?php
         }
 

wp-admin/js/post.js

@@ -95 +95 @@
                  *
                  * @memberof commentsBox
                  */
-                load: function(total){
-                        this.st = jQuery('#the-comment-list tr.comment:visible').length;
+                load: function(total,comment_type){
+                        this.st = jQuery('#the-comment-list tr.'+comment_type+':visible').length;
                         this.get(total);
                 }
         };