From 0f2078bc9ee61d8abc8baa6b824bb83b3409fe18 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Sat, 12 Sep 2015 02:27:50 +0000
Subject: [PATCH] When clicking "Show More Comments" in the Comments meta box
 on the Edit Post screen, change the click behavior to call a new class method
 on `commentsBox`, `->load()`, that resets `st` (cool name) to the number of
 visible `<tr>`s before calling `->get()`. This will account for spam'd and
 trash'd comments when returning comments at the proper offset.

Props utkarshpatel.
Fixes #33829.


git-svn-id: https://develop.svn.wordpress.org/trunk@34069 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/meta-boxes.php | 2 +-
 src/wp-admin/js/post.js              | 5 +++++
 src/wp-includes/comment-template.php | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index e0ac4041d1..c4f318927b 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -690,7 +690,7 @@ function post_comment_meta_box( $post ) {
 		}
 
 		?>
-		<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?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; ?>);return false;"><?php _e('Show comments'); ?></a> <span class="spinner"></span></p>
 		<?php
 	}
 
diff --git a/src/wp-admin/js/post.js b/src/wp-admin/js/post.js
index 19b94ed367..489df6a230 100644
--- a/src/wp-admin/js/post.js
+++ b/src/wp-admin/js/post.js
@@ -59,6 +59,11 @@ commentsBox = {
 		);
 
 		return false;
+	},
+
+	load: function(total){
+		this.st = jQuery('#the-comment-list tr.comment:visible').length;
+		this.get(total);
 	}
 };
 
diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index f81d6000bb..9d63bd3af9 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -853,7 +853,7 @@ function get_comment_text( $comment_ID = 0, $args = array() ) {
 function comment_text( $comment_ID = 0, $args = array() ) {
 	$comment = get_comment( $comment_ID );
 
-	$comment_text = get_comment_text( $comment_ID , $args );
+	$comment_text = get_comment_text( $comment, $args );
 	/**
 	 * Filter the text of a comment to be displayed.
 	 *