Ticket #43857: 43857.8.diff

src/wp-comments-post.php

@@ -56 +56 @@
 
 $location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
 
+/**
+ * Add specific query arguments to display the awaiting moderation message
+ * to users who refused to use comment cookies.
+ */
+if ( ! $cookies_consent && 'unapproved' === wp_get_comment_status( $comment ) ) {
+        $location = add_query_arg(
+                array(
+                        'unapproved'      => $comment->comment_ID,
+                        'moderation-hash' => wp_hash( $comment->comment_date_gmt ),
+                ),
+                $location
+        );
+}
+
 /**
  * Filters the location URI to send the commenter after posting.
  *

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

@@ -263 +263 @@
                         $tag       = 'li';
                         $add_below = 'div-comment';
                 }
+
+                $current_commenter = wp_get_current_commenter();
                 ?>
                 <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
                 <?php if ( 'div' != $args['style'] ) : ?>
@@ -282 +284 @@
                         ?>
                 </div>
                 <?php if ( '0' == $comment->comment_approved ) : ?>
-                <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></em>
-                <br />
+                        <em class="comment-awaiting-moderation">
+                                <?php
+                                esc_html_e( 'Your comment is awaiting moderation.' );
+
+                                if ( ! $current_commenter['comment_author_email'] ) {
+                                        echo ' ';
+                                        esc_html_e( 'This message is only shown when a new comment was posted.' );
+                                }
+                                ?>
+                        </em>
+                        <br />
                 <?php endif; ?>
 
                 <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
@@ -344 +355 @@
          * @param array      $args    An array of arguments.
          */
         protected function html5_comment( $comment, $depth, $args ) {
-                $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+                $tag               = ( 'div' === $args['style'] ) ? 'div' : 'li';
+                $current_commenter = wp_get_current_commenter();
                 ?>
                 <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
                         <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
@@ -376 +388 @@
                                         </div><!-- .comment-metadata -->
 
                                         <?php if ( '0' == $comment->comment_approved ) : ?>
-                                        <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+                                                <p class="comment-awaiting-moderation">
+                                                <?php
+                                                esc_html_e( 'Your comment is awaiting moderation.' );
+
+                                                if ( ! $current_commenter['comment_author_email'] ) {
+                                                        echo ' ';
+                                                        esc_html_e( 'This message is only shown when a new comment was posted.' );
+                                                }
+                                                ?>
+                                                </p>
                                         <?php endif; ?>
                                 </footer><!-- .comment-meta -->
 

src/wp-includes/comment-template.php

@@ -1350 +1350 @@
          */
         $comment_author_email = $commenter['comment_author_email'];
 
+        /**
+         * Set the comment's author email for unapproved commenters who refused
+         * to use comment cookies.
+         */
+        if ( ! $comment_author_email ) {
+                $comment_author_email = wp_get_unapproved_commenter_email();
+        }
+
         /*
          * The url of the current comment author escaped for use in attributes.
          */
@@ -1690 +1698 @@
 
                 $link = sprintf(
                         "<a rel='nofollow' class='comment-reply-link' href='%s' %s aria-label='%s'>%s</a>",
-                        esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . '#' . $args['respond_id'],
+                        esc_url(
+                                add_query_arg(
+                                        array(
+                                                'replytocom'      => $comment->comment_ID,
+                                                'unapproved'      => false,
+                                                'moderation-hash' => false,
+                                        )
+                                )
+                        ) . '#' . $args['respond_id'],
                         $data_attribute_string,
                         esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
                         $args['reply_text']
@@ -2058 +2074 @@
                                         $commenter = wp_get_current_commenter();
                                         if ( $commenter['comment_author_email'] ) {
                                                 $comment_args['include_unapproved'] = $commenter['comment_author_email'];
+                                        } else {
+                                                $comment_author_email = wp_get_unapproved_commenter_email();
+
+                                                if ( $comment_author_email ) {
+                                                        $comment_args['include_unapproved'] = $comment_author_email;
+                                                }
                                         }
                                 }
 

src/wp-includes/comment.php

@@ -1768 +1768 @@
         return apply_filters( 'wp_get_current_commenter', compact( 'comment_author', 'comment_author_email', 'comment_author_url' ) );
 }
 
+/**
+ * Get unapproved commenter's email.
+ *
+ * Used when a commenter did not consent to use comment cookies.
+ *
+ * @since 5.1.0
+ *
+ * @return string The unapproved commenter's email.
+ */
+function wp_get_unapproved_commenter_email() {
+        $commenter_email = '';
+
+        if ( isset( $_GET['unapproved'] ) && isset( $_GET['moderation-hash'] ) ) {
+                $comment = get_comment( $_GET['unapproved'] );
+
+                if ( hash_equals( $_GET['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
+                        $commenter_email = $comment->comment_author_email;
+                }
+        }
+
+        return $commenter_email;
+}
+
 /**
  * Inserts a comment into the database.
  *

tests/phpunit/tests/comment/commentsTemplate.php

@@ -831 +831 @@
                 return $commenter;
         }
 
+        /**
+         * @ticket 43857
+         */
+        public function test_comments_list_should_include_just_posted_unapproved_comment() {
+                $now = time();
+                $p   = self::factory()->post->create();
+                $c   = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => $p,
+                                'comment_content'  => '1',
+                                'comment_approved' => '0',
+                                'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ),
+                                'comment_author_email' => 'foo@bar.mail',
+                        )
+                );
+                $comment = get_comment( $c );
+
+                $this->go_to( add_query_arg(
+                        array(
+                                'unapproved'      => $comment->comment_ID,
+                                'moderation-hash' => wp_hash( $comment->comment_date_gmt ),
+                        ),
+                        get_comment_link( $comment )
+                ) );
+
+                $found = get_echo( 'comments_template' );
+
+                // Find the found comment in the markup.
+                preg_match( '|id="comment-([0-9]+)|', $found, $matches );
+
+                $found_cid = (int) $matches[1];
+                $this->assertSame( $c, $found_cid );
+        }
+
         /**
          * @ticket 35378
          */