Changeset 48133 for trunk/src/wp-includes/comment.php

Timestamp:

06/23/2020 05:22:39 AM (6 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.

File:

• trunk/src/wp-includes/comment.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -1133 +1133 @@
         );
 
+        $include_unapproved = wp_get_include_unapproved_comments_argument();
+        if ( $include_unapproved ) {
+            $comment_args['include_unapproved'] = $include_unapproved;
+        }
+
+        /**
+         * Filters the arguments used to query comments in get_page_of_comment().
+         *
+         * @since 5.5.0
+         *
+         * @see WP_Comment_Query::__construct()
+         *
+         * @param array $comment_args {
+         *     Array of WP_Comment_Query arguments.
+         *
+         *     @type string $type               Limit paginated comments to those matching a given type. Accepts 'comment',
+         *                                      'trackback', 'pingback', 'pings' (trackbacks and pingbacks), or 'all'.
+         *                                      Default is 'all'.
+         *     @type int    $post_id            ID of the post.
+         *     @type string $fields             Comment fields to return.
+         *     @type bool   $count              Whether to return a comment count (true) or array of
+         *                                      comment objects (false)
+         *     @type string $status             Comment status.
+         *     @type int    $parent             Parent ID of comment to retrieve children of.
+         *     @type array  $date_query         Date query clauses to limit comments by. See WP_Date_Query.
+         *     @type array  $include_unapproved Array of IDs or email addresses whose unapproved comments
+         *                                      will be included in paginated comments.
+         * }
+         */
+        $comment_args        = apply_filters( 'get_page_of_comment_query_args', $comment_args );
         $comment_query       = new WP_Comment_Query();
         $older_comment_count = $comment_query->query( $comment_args );
@@ -1895 +1925 @@
 
     return $commenter_email;
+}
+
+/**
+ * Get include unapproved comments query argument.
+ *
+ * Used to include unapproved comments of currrent commenters to
+ * keep them informed their comments were successfully saved.
+ *
+ * @since 5.5.0
+ *
+ * @return array The unapproved comments query argument.
+ */
+function wp_get_include_unapproved_comments_argument() {
+    $user_id            = get_current_user_id();
+    $include_unapproved = array();
+
+    if ( $user_id ) {
+        $include_unapproved = array( $user_id );
+    } else {
+        $unapproved_email = wp_get_unapproved_comment_author_email();
+
+        if ( $unapproved_email ) {
+            $include_unapproved = array( $unapproved_email );
+        }
+    }
+
+    return $include_unapproved;
 }