Changeset 50271

Timestamp:

02/09/2021 04:55:29 PM (4 years ago)

Author:

johnbillion

Message:

Comments: Extend the duration of the window within which unapproved comments are visible by their author.

This extension is necessary because the comment approval notification opt-in form introduced in [47887] uses the same mechanism, and the previous limit of one minute meant that users on a slow connection, using assistive technology, with limited motor skills, or who are generally indecisive may not complete the opt-in action within one minute, and therefore not see the confirmation message.

Props joedolson, imath, hellofromTonya, peterwilsoncc, alexstine, davidbaumwald 

Fixes #52406

Location:

trunk/src/wp-includes

Files:

• class-wp.php (modified) (1 diff)
• comment.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp.php

@@ -406 +406 @@
             $headers = array_merge( $headers, wp_get_nocache_headers() );
         } elseif ( ! empty( $_GET['unapproved'] ) && ! empty( $_GET['moderation-hash'] ) ) {
-            // Unmoderated comments are only visible for one minute via the moderation hash.
-            $headers['Expires']       = gmdate( 'D, d M Y H:i:s', time() + MINUTE_IN_SECONDS );
-            $headers['Cache-Control'] = 'max-age=60, must-revalidate';
+            // Unmoderated comments are only visible for 10 minutes via the moderation hash.
+            $expires = 10 * MINUTE_IN_SECONDS;
+
+            $headers['Expires']       = gmdate( 'D, d M Y H:i:s', time() + $expires );
+            $headers['Cache-Control'] = sprintf(
+                'max-age=%d, must-revalidate',
+                $expires
+            );
         }
         if ( ! empty( $this->query_vars['error'] ) ) {

trunk/src/wp-includes/comment.php

@@ -1923 +1923 @@
  *
  * @since 5.1.0
+ * @since 5.7.0 The window within which the author email for an unapproved comment
+ *              can be retrieved was extended to 10 minutes.
  *
  * @return string The unapproved comment author's email (when supplied).
@@ -1934 +1936 @@
 
         if ( $comment && hash_equals( $_GET['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
-            // The comment will only be viewable by the comment author for 1 minute.
-            $comment_preview_expires = strtotime( $comment->comment_date_gmt . '+1 minute' );
+            // The comment will only be viewable by the comment author for 10 minutes.
+            $comment_preview_expires = strtotime( $comment->comment_date_gmt . '+10 minutes' );
 
             if ( time() < $comment_preview_expires ) {