Ticket #16612: 16612.3.diff

src/wp-includes/class-wp.php

@@ -401 +401 @@
                 $status = null;
                 $exit_required = false;
 
-                if ( is_user_logged_in() )
+                if ( is_user_logged_in() || wp_check_comment_cookies() )
                         $headers = array_merge($headers, wp_get_nocache_headers());
                 if ( ! empty( $this->query_vars['error'] ) ) {
                         $status = (int) $this->query_vars['error'];

src/wp-includes/comment.php

@@ -523 +523 @@
 }
 
 /**
+ * Determine if any comment author identity cookies are present.
+ *
+ * @since 4.7.0
+ *
+ * @return boolean True if any comment cookies are found, otherwise false.
+ */
+function wp_check_comment_cookies() {
+        if ( isset( $_COOKIE[ 'comment_author_' . COOKIEHASH ] ) || isset( $_COOKIE[ 'comment_author_email_' . COOKIEHASH ] ) || isset( $_COOKIE[ 'comment_author_url_' . COOKIEHASH ] ) ) {
+                return true;
+        }
+
+        return false;
+}
+
+/**
  * Sanitizes the cookies sent to the user already.
  *
  * Will only do anything if the cookies have already been created for the user.