Changeset 44659 for trunk/src/wp-includes/comment-template.php

Timestamp:

01/21/2019 01:33:50 AM (6 years ago)

Author:

pento

Message:

Comments: Show the "awaiting moderation" message when comment cookies are disabled.

The "Your comment is awaiting moderation." message relied upon the comment author cookie being set. However, since it's now possible to opt-out of that cookie, submitting a comment won't show the comment preview when the comment is placed in moderation.

To avoid this issue, we now include a hash in the redirect URL, allowing the site to identify that a preview of the moderated comment should be displayed.

Props imath, tomdxw, birgire, lakenh, azaozz, pento.
Fixes #43857.

File:

• trunk/src/wp-includes/comment-template.php (modified) (4 diffs)

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

@@ -1373 +1373 @@
     if ( $user_ID ) {
         $comment_args['include_unapproved'] = array( $user_ID );
-    } elseif ( ! empty( $comment_author_email ) ) {
-        $comment_args['include_unapproved'] = array( $comment_author_email );
+    } else {
+        $unapproved_email = wp_get_unapproved_comment_author_email();
+
+        if ( $unapproved_email ) {
+            $comment_args['include_unapproved'] = array( $unapproved_email );
+        }
     }
 
@@ -1691 +1695 @@
         $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 ) ),
@@ -1833 +1845 @@
 
     $style = isset( $_GET['replytocom'] ) ? '' : ' style="display:none;"';
-    $link  = esc_html( remove_query_arg( 'replytocom' ) ) . '#respond';
+    $link  = esc_html( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
 
     $formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
@@ -2056 +2068 @@
                     $comment_args['include_unapproved'] = get_current_user_id();
                 } else {
-                    $commenter = wp_get_current_commenter();
-                    if ( $commenter['comment_author_email'] ) {
-                        $comment_args['include_unapproved'] = $commenter['comment_author_email'];
+                    $unapproved_email = wp_get_unapproved_comment_author_email();
+
+                    if ( $unapproved_email ) {
+                        $comment_args['include_unapproved'] = array( $unapproved_email );
                     }
                 }