From 8910870205d4fdc9fe763688d5ec60771e2d5a45 Mon Sep 17 00:00:00 2001 From: Rachel Baker Date: Thu, 9 Jun 2016 02:21:27 +0000 Subject: [PATCH] Comments: Fix pagination totals in the response of the inline delete actions when filtering the List Table by comment_type. Within the Ajax action `_wp_ajax_delete_comment_response()` if the comment_type query var is set, fallback to the previous `$total - 1` value instead of getting an incorrect value from `wp_comment_count()`. Fixes #36991. git-svn-id: https://develop.svn.wordpress.org/trunk@37664 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/ajax-actions.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index f3751cb025..5ae364f01d 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/wp-admin/includes/ajax-actions.php @@ -395,14 +395,20 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) { $status = $query_vars['comment_status']; if ( !empty( $query_vars['p'] ) ) $post_id = (int) $query_vars['p']; + if ( ! empty( $query_vars['comment_type'] ) ) + $type = $query_vars['comment_type']; } - $comment_count = wp_count_comments($post_id); + if ( empty( $type ) ) { + // Only use the comment count if not filtering by a comment_type. + $comment_count = wp_count_comments($post_id); - // We're looking for a known type of comment count. - if ( isset( $comment_count->$status ) ) - $total = $comment_count->$status; - // Else use the decremented value from above. + // We're looking for a known type of comment count. + if ( isset( $comment_count->$status ) ) { + $total = $comment_count->$status; + } + } + // Else use the decremented value from above. } // The time since the last comment count.