Changeset 36041 for branches/4.4/src/wp-includes/comment-template.php

Timestamp:

12/21/2015 03:10:45 AM (9 years ago)

Author:

boonebgorges

Message:

Respect approval status when determining comment page count in comments_template().

Since 4.4, when fetching the first page of comments and the 'newest' comments
are set to display first, comments_template() must perform arithmetic to
determine which comments to show. See #8071. This arithmetic requires the
total comment count for the current post, which is calculated with a separate
WP_Comment_Query. This secondary comment query did not properly account for
non-approved comment statuses; all unapproved comments should be part of the
comment count for admins, and individual users should have their own
unapproved comments included in the count. As a result, comments_template()
was, in some cases, being fooled into thinking that a post had fewer comments
available for pagination than it actually had, which resulted in empty pages
of comments.

We correct this problem by mirroring 'status' and 'include_unapproved' params
of the main comment query within the secondary query used to calculate pagination.

Merges [36040] to the 4.4 branch.

Fixes #35068.

Location:

branches/4.4

Files:

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

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

@@ -1314 +1314 @@
             // If fetching the first page of 'newest', we need a top-level comment count.
             $top_level_query = new WP_Comment_Query();
-            $top_level_count = $top_level_query->query( array(
+            $top_level_args  = array(
                 'count'   => true,
                 'orderby' => false,
                 'post_id' => $post->ID,
                 'parent'  => 0,
-            ) );
+                'status'  => 'approve',
+            );
+
+            if ( isset( $comment_args['include_unapproved'] ) ) {
+                $top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
+            }
+
+            $top_level_count = $top_level_query->query( $top_level_args );
 
             $comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;