Ticket #35356: comment-template.patch

wp-includes/comment-template.php

@@ -1905 +1905 @@
          */
         $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;
@@ -1940 +1919 @@
                         $_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;
-                }
+                /*
+                 * 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;
+                        }
 
-                // 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;
+                        $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',
+                                ) );
 
-                        // When first page shows oldest comments, post permalink is the same as the comment permalink.
-                        } elseif ( $cpage == 1 ) {
-                                $r['cpage'] = '';
+                                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;
+                                }
+                        }
+                } 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 {
-                                $r['cpage'] = $cpage;
+                                $_comments = $wp_query->comments;
                         }
 
-                        $r['page'] = 0;
-                        $r['per_page'] = 0;
+                        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;
+                        }
                 }
         }