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

Respect custom pagination params when using `wp_list_comments()` in a query loop. 

[36157] fixed a problem, introduced in 4.4, that caused custom pagination
parameters passed to `wp_list_comments()`. However, the fix introduced in that
changeset was limited to the `is_singular()` context, so that the bug remained
when `wp_list_comments()` is used within a non-singular `WP_Query` loop. We
fix this by removing the `is_singular()` check and using the more general
`get_the_ID()` to identify the correct post_id to use for the secondary
comment query.

Fixes #35402.
Built from https://develop.svn.wordpress.org/trunk@36324


git-svn-id: http://core.svn.wordpress.org/trunk@36291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2016-01-15 19:48:25 +00:00
parent d5bc0fe493
commit d2dabdecf6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/comment-template.php
View File

@ -1926,7 +1926,7 @@ function wp_list_comments( $args = array(), $comments = null ) {
* If 'page' or 'per_page' has been passed, and does not match what's in $wp_query, * If 'page' or 'per_page' has been passed, and does not match what's in $wp_query,
* perform a separate comment query and allow Walker_Comment to paginate. * perform a separate comment query and allow Walker_Comment to paginate.
*/ */
if ( is_singular() && ( $r['page'] || $r['per_page'] ) ) { if ( $r['page'] || $r['per_page'] ) {
$current_cpage = get_query_var( 'cpage' ); $current_cpage = get_query_var( 'cpage' );
if ( ! $current_cpage ) { if ( ! $current_cpage ) {
$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages; $current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
@ -1934,8 +1934,9 @@ function wp_list_comments( $args = array(), $comments = null ) {
$current_per_page = get_query_var( 'comments_per_page' ); $current_per_page = get_query_var( 'comments_per_page' );
if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) { if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
$comments = get_comments( array( $comments = get_comments( array(
'post_id' => get_queried_object_id(), 'post_id' => get_the_ID(),
'orderby' => 'comment_date_gmt', 'orderby' => 'comment_date_gmt',
'order' => 'ASC', 'order' => 'ASC',
'status' => 'all', 'status' => 'all',

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-1452886512627'; $wp_version = '4.5-alpha-1452887291993';
/** /**
* 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.