Ticket #35402: 35402.diff

src/wp-includes/comment-template.php

@@ -1242 +1242 @@
  * @global int        $user_ID
  * @global string     $user_identity
  * @global bool       $overridden_cpage
- * @global bool       $withcomments 
+ * @global bool       $withcomments
  *
  * @param string $file              Optional. The file to load. Default '/comments.php'.
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
@@ -1928 +1928 @@
                  * 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'] ) ) {
+                if ( $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;
@@ -1936 +1936 @@
 
                         $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',
                                         'status' => 'all',