Changeset 44659 for trunk/src/wp-includes/comment.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.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -1770 +1770 @@
 
 /**
+ * Get unapproved comment author's email.
+ *
+ * Used to allow the commenter to see their pending comment.
+ *
+ * @since 5.1.0
+ *
+ * @return string The unapproved comment author's email (when supplied).
+ */
+function wp_get_unapproved_comment_author_email() {
+    $commenter_email = '';
+
+    if ( ! empty( $_GET['unapproved'] ) && ! empty( $_GET['moderation-hash'] ) ) {
+        $comment_id = (int) $_GET['unapproved'];
+        $comment    = get_comment( $comment_id );
+
+        if ( $comment && hash_equals( $_GET['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
+            $commenter_email = $comment->comment_author_email;
+        }
+    }
+
+    if ( ! $commenter_email ) {
+        $commenter       = wp_get_current_commenter();
+        $commenter_email = $commenter['comment_author_email'];
+    }
+
+    return $commenter_email;
+}
+
+/**
  * Inserts a comment into the database.
  *