Changeset 47985

Timestamp:

06/10/2020 07:21:12 PM (4 years ago)

Author:

whyisjake

Message:

Editor: Ensure latest comments can only be viewed from public posts.

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

Props: poena, xknown.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/blocks/render.php (modified) (1 diff)

branches/5.4/src/wp-includes/comment-template.php

@@ -595 +595 @@
  */
 function get_comment_excerpt( $comment_ID = 0 ) {
-    $comment      = get_comment( $comment_ID );
-    $comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
+    $comment = get_comment( $comment_ID );
+
+    if ( ! post_password_required( $comment->comment_post_ID ) ) {
+        $comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
+    } else {
+        $comment_text = __( 'Password protected' );
+    }
 
     /* translators: Maximum number of words used in a comment excerpt. */

branches/5.4/tests/phpunit/tests/blocks/render.php

@@ -290 +290 @@
     }
 
+    public function test_render_latest_comments_on_password_protected_post() {
+        $post_id      = self::factory()->post->create(
+            array(
+                'post_password' => 'password',
+            )
+        );
+        $comment_text = wp_generate_password( 10, false );
+        self::factory()->comment->create(
+            array(
+                'comment_post_ID' => $post_id,
+                'comment_content' => $comment_text,
+            )
+        );
+        $comments = do_blocks( '<!-- wp:latest-comments {"commentsToShow":1,"displayExcerpt":true} /-->' );
+
+        $this->assertNotContains( $comment_text, $comments );
+    }
+
     /**
      * @ticket 45109