Changeset 47888 for branches/5.4/src/wp-includes/class-walker-comment.php

Timestamp:

06/02/2020 08:24:59 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.

This brings the changes from [47887] to the 5.4 branch.

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

File:

• branches/5.4/src/wp-includes/class-walker-comment.php (modified) (8 diffs)

branches/5.4/src/wp-includes/class-walker-comment.php

@@ -180 +180 @@
             $output .= ob_get_clean();
             return;
+        }
+
+        if ( 'comment' === $comment->comment_type ) {
+            add_filter( 'comment_text', array( $this, 'comment_text' ), 40, 2 );
         }
 
@@ -195 +199 @@
             $output .= ob_get_clean();
         }
+
+        if ( 'comment' === $comment->comment_type ) {
+            remove_filter( 'comment_text', array( $this, 'comment_text' ), 40, 2 );
+        }
     }
 
@@ -246 +254 @@
 
     /**
+     * Remove links from the pending comment's text if the commenter has not consent to the comment cookie.
+     *
+     * @since 5.4.2
+     *
+     * @param string          $comment_text Text of the current comment.
+     * @param WP_Comment|null $comment      The comment object.
+     * @return string                       Text of the current comment.
+     */
+    function comment_text( $comment_text, $comment ) {
+        $commenter          = wp_get_current_commenter();
+        $show_pending_links = ! empty( $commenter['comment_author'] );
+
+        if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
+            return wp_kses( $comment_text, array() );
+        }
+
+        return $comment_text;
+    }
+
+    /**
      * Outputs a single comment.
      *
@@ -265 +293 @@
         }
 
-        $commenter = wp_get_current_commenter();
+        $commenter          = wp_get_current_commenter();
+        $show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author'];
         if ( $commenter['comment_author_email'] ) {
             $moderation_note = __( 'Your comment is awaiting moderation.' );
@@ -280 +309 @@
             <?php
             if ( 0 != $args['avatar_size'] ) {
-                echo get_avatar( $comment, $args['avatar_size'] );}
+                echo get_avatar( $comment, $args['avatar_size'] );
+            }
             ?>
             <?php
-                printf(
-                    /* translators: %s: Comment author link. */
-                    __( '%s <span class="says">says:</span>' ),
-                    sprintf( '<cite class="fn">%s</cite>', get_comment_author_link( $comment ) )
-                );
+            $comment_author = get_comment_author_link( $comment );
+            if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
+                $comment_author = get_comment_author( $comment );
+            }
+            printf(
+                /* translators: %s: Comment author link. */
+                __( '%s <span class="says">says:</span>' ),
+                sprintf( '<cite class="fn">%s</cite>', $comment_author )
+            );
             ?>
         </div>
@@ -355 +389 @@
         $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
 
-        $commenter = wp_get_current_commenter();
+        $commenter          = wp_get_current_commenter();
+        $show_pending_links = ! empty( $commenter['comment_author'] );
         if ( $commenter['comment_author_email'] ) {
             $moderation_note = __( 'Your comment is awaiting moderation.' );
@@ -373 +408 @@
                         ?>
                         <?php
-                            printf(
-                                /* translators: %s: Comment author link. */
-                                __( '%s <span class="says">says:</span>' ),
-                                sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
-                            );
+                        $comment_author = get_comment_author_link( $comment );
+                        if ( '0' == $comment->comment_approved && ! $show_pending_links ) {
+                            $comment_author = get_comment_author( $comment );
+                        }
+                        printf(
+                            /* translators: %s: Comment author link. */
+                            __( '%s <span class="says">says:</span>' ),
+                            sprintf( '<b class="fn">%s</b>', $comment_author )
+                        );
                         ?>
                     </div><!-- .comment-author -->
@@ -403 +442 @@
 
                 <?php
-                comment_reply_link(
-                    array_merge(
-                        $args,
-                        array(
-                            'add_below' => 'div-comment',
-                            'depth'     => $depth,
-                            'max_depth' => $args['max_depth'],
-                            'before'    => '<div class="reply">',
-                            'after'     => '</div>',
+                if ( '1' == $comment->comment_approved || $show_pending_links ) {
+                    comment_reply_link(
+                        array_merge(
+                            $args,
+                            array(
+                                'add_below' => 'div-comment',
+                                'depth'     => $depth,
+                                'max_depth' => $args['max_depth'],
+                                'before'    => '<div class="reply">',
+                                'after'     => '</div>',
+                            )
                         )
-                    )
-                );
+                    );
+                }
                 ?>
             </article><!-- .comment-body -->