Skip to content

Commit a0d1d6b

Browse files
SergeyBiryukovSergeyBiryukov
committed
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. Props jonkolbert, ayeshrajans, Asif2BD, peterwilsoncc, imath, audrasjb, jonoaldersonwp, whyisjake, SergeyBiryukov. Merges [47887] and [47889] to the 5.3 branch. See #49956. git-svn-id: https://develop.svn.wordpress.org/branches/5.3@47916 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 32b4000 commit a0d1d6b

6 files changed

Lines changed: 96 additions & 34 deletions

File tree

‎src/wp-comments-post.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
5858

59-
// Add specific query arguments to display the awaiting moderation message.
60-
if ( 'unapproved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_author_email ) ) {
59+
// If user didn't consent to cookies, add specific query arguments to display the awaiting moderation message.
60+
if ( ! $cookies_consent && 'unapproved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_author_email ) ) {
6161
$location = add_query_arg(
6262
array(
6363
'unapproved' => $comment->comment_ID,

‎src/wp-includes/class-walker-comment.php‎

Lines changed: 75 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,11 @@ public function start_el( &$output, $comment, $depth = 0, $args = array(), $id =
181181
return;
182182
}
183183

184-
if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
184+
if ( 'comment' === $comment->comment_type ) {
185+
add_filter( 'comment_text', array( $this, 'filter_comment_text' ), 40, 2 );
186+
}
187+
188+
if ( ( 'pingback' === $comment->comment_type || 'trackback' === $comment->comment_type ) && $args['short_ping'] ) {
185189
ob_start();
186190
$this->ping( $comment, $depth, $args );
187191
$output .= ob_get_clean();
@@ -194,6 +198,10 @@ public function start_el( &$output, $comment, $depth = 0, $args = array(), $id =
194198
$this->comment( $comment, $depth, $args );
195199
$output .= ob_get_clean();
196200
}
201+
202+
if ( 'comment' === $comment->comment_type ) {
203+
remove_filter( 'comment_text', array( $this, 'filter_comment_text' ), 40, 2 );
204+
}
197205
}
198206

199207
/**
@@ -244,6 +252,29 @@ protected function ping( $comment, $depth, $args ) {
244252
<?php
245253
}
246254

255+
/**
256+
* Filters the comment text.
257+
*
258+
* Removes links from the pending comment's text if the commenter did not consent
259+
* to the comment cookies.
260+
*
261+
* @since 5.4.2
262+
*
263+
* @param string $comment_text Text of the current comment.
264+
* @param WP_Comment|null $comment The comment object. Null if not found.
265+
* @return string Filtered text of the current comment.
266+
*/
267+
public function filter_comment_text( $comment_text, $comment ) {
268+
$commenter = wp_get_current_commenter();
269+
$show_pending_links = ! empty( $commenter['comment_author'] );
270+
271+
if ( $comment && '0' == $comment->comment_approved && ! $show_pending_links ) {
272+
$comment_text = wp_kses( $comment_text, array() );
273+
}
274+
275+
return $comment_text;
276+
}
277+
247278
/**
248279
* Outputs a single comment.
249280
*
@@ -264,13 +295,14 @@ protected function comment( $comment, $depth, $args ) {
264295
$add_below = 'div-comment';
265296
}
266297

267-
$commenter = wp_get_current_commenter();
298+
$commenter = wp_get_current_commenter();
299+
$show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author'];
300+
268301
if ( $commenter['comment_author_email'] ) {
269302
$moderation_note = __( 'Your comment is awaiting moderation.' );
270303
} else {
271304
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
272305
}
273-
274306
?>
275307
<<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
276308
<?php if ( 'div' != $args['style'] ) : ?>
@@ -279,14 +311,21 @@ protected function comment( $comment, $depth, $args ) {
279311
<div class="comment-author vcard">
280312
<?php
281313
if ( 0 != $args['avatar_size'] ) {
282-
echo get_avatar( $comment, $args['avatar_size'] );}
314+
echo get_avatar( $comment, $args['avatar_size'] );
315+
}
283316
?>
284317
<?php
285-
printf(
286-
/* translators: %s: Comment author link. */
287-
__( '%s <span class="says">says:</span>' ),
288-
sprintf( '<cite class="fn">%s</cite>', get_comment_author_link( $comment ) )
289-
);
318+
$comment_author = get_comment_author_link( $comment );
319+
320+
if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
321+
$comment_author = get_comment_author( $comment );
322+
}
323+
324+
printf(
325+
/* translators: %s: Comment author link. */
326+
__( '%s <span class="says">says:</span>' ),
327+
sprintf( '<cite class="fn">%s</cite>', $comment_author )
328+
);
290329
?>
291330
</div>
292331
<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -354,13 +393,14 @@ protected function comment( $comment, $depth, $args ) {
354393
protected function html5_comment( $comment, $depth, $args ) {
355394
$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
356395

357-
$commenter = wp_get_current_commenter();
396+
$commenter = wp_get_current_commenter();
397+
$show_pending_links = ! empty( $commenter['comment_author'] );
398+
358399
if ( $commenter['comment_author_email'] ) {
359400
$moderation_note = __( 'Your comment is awaiting moderation.' );
360401
} else {
361402
$moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' );
362403
}
363-
364404
?>
365405
<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
366406
<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
@@ -372,11 +412,17 @@ protected function html5_comment( $comment, $depth, $args ) {
372412
}
373413
?>
374414
<?php
375-
printf(
376-
/* translators: %s: Comment author link. */
377-
__( '%s <span class="says">says:</span>' ),
378-
sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
379-
);
415+
$comment_author = get_comment_author_link( $comment );
416+
417+
if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
418+
$comment_author = get_comment_author( $comment );
419+
}
420+
421+
printf(
422+
/* translators: %s: Comment author link. */
423+
__( '%s <span class="says">says:</span>' ),
424+
sprintf( '<b class="fn">%s</b>', $comment_author )
425+
);
380426
?>
381427
</div><!-- .comment-author -->
382428

@@ -402,18 +448,20 @@ protected function html5_comment( $comment, $depth, $args ) {
402448
</div><!-- .comment-content -->
403449

404450
<?php
405-
comment_reply_link(
406-
array_merge(
407-
$args,
408-
array(
409-
'add_below' => 'div-comment',
410-
'depth' => $depth,
411-
'max_depth' => $args['max_depth'],
412-
'before' => '<div class="reply">',
413-
'after' => '</div>',
451+
if ( '1' == $comment->comment_approved || $show_pending_links ) {
452+
comment_reply_link(
453+
array_merge(
454+
$args,
455+
array(
456+
'add_below' => 'div-comment',
457+
'depth' => $depth,
458+
'max_depth' => $args['max_depth'],
459+
'before' => '<div class="reply">',
460+
'after' => '</div>',
461+
)
414462
)
415-
)
416-
);
463+
);
464+
}
417465
?>
418466
</article><!-- .comment-body -->
419467
<?php

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,15 @@ protected function get_comment_ids() {
553553
// Numeric values are assumed to be user ids.
554554
if ( is_numeric( $unapproved_identifier ) ) {
555555
$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
556-
557-
// Otherwise we match against email addresses.
558556
} else {
559-
$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
557+
// Otherwise we match against email addresses.
558+
if ( ! empty( $_GET['unapproved'] ) && ! empty( $_GET['moderation-hash'] ) ) {
559+
// Only include requested comment.
560+
$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' AND comment_ID = %d )", $unapproved_identifier, (int) $_GET['unapproved'] );
561+
} else {
562+
// Include all of the author's unapproved comments.
563+
$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
564+
}
560565
}
561566
}
562567
}

‎src/wp-includes/class-wp.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ public function send_headers() {
403403

404404
if ( is_user_logged_in() ) {
405405
$headers = array_merge( $headers, wp_get_nocache_headers() );
406+
} elseif ( ! empty( $_GET['unapproved'] ) && ! empty( $_GET['moderation-hash'] ) ) {
407+
// Unmoderated comments are only visible for one minute via the moderation hash.
408+
$headers['Expires'] = gmdate( 'D, d M Y H:i:s', time() + MINUTE_IN_SECONDS );
409+
$headers['Cache-Control'] = 'max-age=60, must-revalidate';
406410
}
407411
if ( ! empty( $this->query_vars['error'] ) ) {
408412
$status = (int) $this->query_vars['error'];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ function comment_text( $comment_ID = 0, $args = array() ) {
997997
* @see Walker_Comment::comment()
998998
*
999999
* @param string $comment_text Text of the current comment.
1000-
* @param WP_Comment|null $comment The comment object.
1000+
* @param WP_Comment|null $comment The comment object. Null if not found.
10011001
* @param array $args An array of arguments.
10021002
*/
10031003
echo apply_filters( 'comment_text', $comment_text, $comment, $args );

‎src/wp-includes/comment.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,12 @@ function wp_get_unapproved_comment_author_email() {
18311831
$comment = get_comment( $comment_id );
18321832

18331833
if ( $comment && hash_equals( $_GET['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
1834-
$commenter_email = $comment->comment_author_email;
1834+
// The comment will only be viewable by the comment author for 1 minute.
1835+
$comment_preview_expires = strtotime( $comment->comment_date_gmt . '+1 minute' );
1836+
1837+
if ( time() < $comment_preview_expires ) {
1838+
$commenter_email = $comment->comment_author_email;
1839+
}
18351840
}
18361841
}
18371842

0 commit comments

Comments
 (0)