Ticket #52406: 52406.diff

src/wp-includes/class-wp.php

@@ -405 +405 @@
                 if ( is_user_logged_in() ) {
                         $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'] ) ) {
                         $status = (int) $this->query_vars['error'];

src/wp-includes/comment.php

@@ -1922 +1922 @@
  * Used to allow the commenter to see their pending comment.
  *
  * @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).
  */
@@ -1933 +1935 @@
                 $comment    = get_comment( $comment_id );
 
                 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 ) {
                                 $commenter_email = $comment->comment_author_email;