mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-28 15:17:42 +02:00
Comments: Always respect $comments
array passed to wp_list_comments()
.
[36157] fixed a bug whereby `wp_list_comments()` would not properly recognize custom pagination arguments. See #35175. However, it inadvertently introduced a bug that caused any `$comments` array explicitly passed to the function to be ignored, when that array was accompanied by pagination arguments that differ from those in `$wp_query`. We address this bug by moving the logic introduced in [36157] inside a block that only fires when no `$comments` array has been provided to the function. Merges [36276] to the 4.4 branch. Props ivankristianto, boonebgorges. Fixes #35356. Built from https://develop.svn.wordpress.org/branches/4.4@36356 git-svn-id: http://core.svn.wordpress.org/branches/4.4@36323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
347698ac3d
commit
a8e4c25622
@ -1934,27 +1934,6 @@ function wp_list_comments( $args = array(), $comments = null ) {
|
||||
*/
|
||||
$r = apply_filters( 'wp_list_comments_args', $r );
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
if ( is_singular() && ( $r['page'] || $r['per_page'] ) ) {
|
||||
$current_cpage = get_query_var( 'cpage' );
|
||||
if ( ! $current_cpage ) {
|
||||
$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
|
||||
}
|
||||
|
||||
$current_per_page = get_query_var( 'comments_per_page' );
|
||||
if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
|
||||
$comments = get_comments( array(
|
||||
'post_id' => get_queried_object_id(),
|
||||
'orderby' => 'comment_date_gmt',
|
||||
'order' => 'ASC',
|
||||
'status' => 'all',
|
||||
) );
|
||||
}
|
||||
}
|
||||
|
||||
// Figure out what comments we'll be looping through ($_comments)
|
||||
if ( null !== $comments ) {
|
||||
$comments = (array) $comments;
|
||||
@ -1969,34 +1948,70 @@ function wp_list_comments( $args = array(), $comments = null ) {
|
||||
$_comments = $comments;
|
||||
}
|
||||
} else {
|
||||
if ( empty($wp_query->comments) )
|
||||
return;
|
||||
if ( 'all' != $r['type'] ) {
|
||||
if ( empty($wp_query->comments_by_type) )
|
||||
$wp_query->comments_by_type = separate_comments($wp_query->comments);
|
||||
if ( empty($wp_query->comments_by_type[$r['type']]) )
|
||||
return;
|
||||
$_comments = $wp_query->comments_by_type[$r['type']];
|
||||
} else {
|
||||
$_comments = $wp_query->comments;
|
||||
}
|
||||
|
||||
// Pagination is already handled by `WP_Comment_Query`, so we tell Walker not to bother.
|
||||
if ( $wp_query->max_num_comment_pages ) {
|
||||
$default_comments_page = get_option( 'default_comments_page' );
|
||||
$cpage = get_query_var( 'cpage' );
|
||||
if ( 'newest' === $default_comments_page ) {
|
||||
$r['cpage'] = $cpage;
|
||||
|
||||
// When first page shows oldest comments, post permalink is the same as the comment permalink.
|
||||
} elseif ( $cpage == 1 ) {
|
||||
$r['cpage'] = '';
|
||||
} else {
|
||||
$r['cpage'] = $cpage;
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
if ( is_singular() && ( $r['page'] || $r['per_page'] ) ) {
|
||||
$current_cpage = get_query_var( 'cpage' );
|
||||
if ( ! $current_cpage ) {
|
||||
$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
|
||||
}
|
||||
|
||||
$r['page'] = 0;
|
||||
$r['per_page'] = 0;
|
||||
$current_per_page = get_query_var( 'comments_per_page' );
|
||||
if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
|
||||
$comments = get_comments( array(
|
||||
'post_id' => get_queried_object_id(),
|
||||
'orderby' => 'comment_date_gmt',
|
||||
'order' => 'ASC',
|
||||
'status' => 'all',
|
||||
) );
|
||||
|
||||
if ( 'all' != $r['type'] ) {
|
||||
$comments_by_type = separate_comments( $comments );
|
||||
if ( empty( $comments_by_type[ $r['type'] ] ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$_comments = $comments_by_type[ $r['type'] ];
|
||||
} else {
|
||||
$_comments = $comments;
|
||||
}
|
||||
}
|
||||
|
||||
// Otherwise, fall back on the comments from `$wp_query->comments`.
|
||||
} else {
|
||||
if ( empty($wp_query->comments) )
|
||||
return;
|
||||
if ( 'all' != $r['type'] ) {
|
||||
if ( empty($wp_query->comments_by_type) )
|
||||
$wp_query->comments_by_type = separate_comments($wp_query->comments);
|
||||
if ( empty($wp_query->comments_by_type[$r['type']]) )
|
||||
return;
|
||||
$_comments = $wp_query->comments_by_type[$r['type']];
|
||||
} else {
|
||||
$_comments = $wp_query->comments;
|
||||
}
|
||||
|
||||
if ( $wp_query->max_num_comment_pages ) {
|
||||
$default_comments_page = get_option( 'default_comments_page' );
|
||||
$cpage = get_query_var( 'cpage' );
|
||||
if ( 'newest' === $default_comments_page ) {
|
||||
$r['cpage'] = $cpage;
|
||||
|
||||
/*
|
||||
* When first page shows oldest comments, post permalink is the same as
|
||||
* the comment permalink.
|
||||
*/
|
||||
} elseif ( $cpage == 1 ) {
|
||||
$r['cpage'] = '';
|
||||
} else {
|
||||
$r['cpage'] = $cpage;
|
||||
}
|
||||
|
||||
$r['page'] = 0;
|
||||
$r['per_page'] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user