WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@37664


git-svn-id: http://core.svn.wordpress.org/trunk@37630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Rachel Baker 2016-06-09 02:22:27 +00:00
parent 445b9b6d94
commit ed964badae
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/includes/ajax-actions.php
View File

@ -395,14 +395,20 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
$status = $query_vars['comment_status']; $status = $query_vars['comment_status'];
if ( !empty( $query_vars['p'] ) ) if ( !empty( $query_vars['p'] ) )
$post_id = (int) $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. // We're looking for a known type of comment count.
if ( isset( $comment_count->$status ) ) if ( isset( $comment_count->$status ) ) {
$total = $comment_count->$status; $total = $comment_count->$status;
// Else use the decremented value from above. }
}
// Else use the decremented value from above.
} }
// The time since the last comment count. // The time since the last comment count.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37663'; $wp_version = '4.6-alpha-37664';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.