Changeset 36360

Timestamp:

01/20/2016 07:58:23 AM (9 years ago)

Author:

dd32

Message:

Comments: 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.

Merges [36324] to the 4.4 branch.
Props boonebgorges.
Fixes #35402.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (2 diffs)

branches/4.4/src/wp-includes/comment-template.php

@@ -1953 +1953 @@
          * 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' );
             if ( ! $current_cpage ) {
@@ -1961 +1961 @@
             $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(),
+                    'post_id' => get_the_ID(),
                     'orderby' => 'comment_date_gmt',
                     'order' => 'ASC',