Changeset 47887 for trunk/src/wp-includes/class-wp-comment-query.php

Timestamp:

06/02/2020 08:10:02 PM (4 years ago)

Author:

whyisjake

Message:

Comments: Ensure that unmoderated comments won't be search indexed.

After a comment is submitted, only allow a brief window where the comment is live on the site.

Fixes #49956.
Props: jonkolbert, ayeshrajans, Asif2BD, peterwilsoncc, imath, audrasjb, jonoaldersonwp, whyisjake.

File:

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

trunk/src/wp-includes/class-wp-comment-query.php

@@ -554 +554 @@
                 if ( is_numeric( $unapproved_identifier ) ) {
                     $approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
-
+                } else {
                     // Otherwise we match against email addresses.
-                } else {
-                    $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+                    if ( ! empty( $_GET['unapproved'] ) && ! empty( $_GET['moderation-hash'] ) ) {
+                        // Only include requested comment.
+                        $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' AND comment_ID = %d )", $unapproved_identifier, (int) $_GET['unapproved'] );
+                    } else {
+                        // Include all of the author's unapproved comments.
+                        $approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+                    }
                 }
             }