Changeset 37655 for trunk/src/wp-includes/comment-template.php

Timestamp:

06/08/2016 04:00:18 AM (10 years ago)

Author:

boonebgorges

Message:

Comments: In wp_list_comments(), queries with custom pagination params should obey default comment_status logic.

When custom pagination parameters are passed to wp_list_comments(), a
secondary query must be performed to fetch the proper comments. See [36157].
This query should show comments of the same comment_status as the default
query initialized in comments_template(): show only comments that are
approved, or those that are unapproved but belong to the current user.

Props smerriman.
Fixes #37048.

File:

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

trunk/src/wp-includes/comment-template.php

@@ -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(
+                $comment_args = array(
                     'post_id' => get_the_ID(),
                     'orderby' => 'comment_date_gmt',
                     'order' => 'ASC',
-                    'status' => 'all',
-                ) );
+                    'status' => 'approve',
+                );
+
+                if ( is_user_logged_in() ) {
+                    $comment_args['include_unapproved'] = get_current_user_id();
+                } else {
+                    $commenter = wp_get_current_commenter();
+                    if ( $commenter['comment_author_email'] ) {
+                        $comment_args['include_unapproved'] = $commenter['comment_author_email'];
+                    }
+                }
+
+                $comments = get_comments( $comment_args );
 
                 if ( 'all' != $r['type'] ) {