Changeset 48133

Timestamp:

06/23/2020 05:22:39 AM (4 years ago)

Author:

whyisjake

Message:

Comments: Ensure the proper comment count and pages for unapproved comments.

Previiously, unapproved comments can alter the comment count, returning incorrect page numbers.

Fixes #8973.

Props GregMulhauser, dd32, ryan, mrmist, hakre, solarissmoke, billerickson, ericlewis, SergeyBiryukov, chriscct7, dossy, lukecavanagh, renggo888, jdorner, matjack1, pento, audrasjb, imath, davidbaumwald, whyisjake.

Location:

trunk

Files:

• src/wp-includes/comment-template.php (modified) (4 diffs)
• src/wp-includes/comment.php (modified) (2 diffs)
• tests/phpunit/tests/comment/getPageOfComment.php (modified) (1 diff)

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

@@ -1331 +1331 @@
  *
  * @since 1.5.0
+
  *
  * @global WP_Query   $wp_query         WordPress Query object.
@@ -1338 +1339 @@
  * @global WP_Comment $comment          Global comment object.
  * @global string     $user_login
- * @global int        $user_ID
  * @global string     $user_identity
  * @global bool       $overridden_cpage
@@ -1348 +1348 @@
  */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
-    global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
+    global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_identity, $overridden_cpage;
 
     if ( ! ( is_single() || is_page() || $withcomments ) || empty( $post ) ) {
@@ -1397 +1397 @@
     }
 
-    if ( $user_ID ) {
-        $comment_args['include_unapproved'] = array( $user_ID );
-    } else {
-        $unapproved_email = wp_get_unapproved_comment_author_email();
-
-        if ( $unapproved_email ) {
-            $comment_args['include_unapproved'] = array( $unapproved_email );
-        }
+    $include_unapproved = wp_get_include_unapproved_comments_argument();
+    if ( $include_unapproved ) {
+        $comment_args['include_unapproved'] = $include_unapproved;
     }
 

trunk/src/wp-includes/comment.php

@@ -1133 +1133 @@
         );
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         $comment_query       = new WP_Comment_Query();
         $older_comment_count = $comment_query->query( $comment_args );
@@ -1895 +1925 @@
 
     return $commenter_email;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/tests/phpunit/tests/comment/getPageOfComment.php

@@ -440 +440 @@
         $this->assertEquals( 2, get_page_of_comment( $c3 ) );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }