Ticket #16612: comment_cookies_nocache.diff

public/wp-includes/class-wp.php

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

public/wp-includes/comment.php

@@ -1995 +1995 @@
         return $open;
 }
 
-?>
+/**
+ * Check to see if any of the comment author cache cookies are set for this request
+ * 
+ * @return bool Whether or not they are.
+ */
+function are_comment_cookies_set() {
+        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) || isset($_COOKIE['comment_author_email_'.COOKIEHASH]) || isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+                return true;
+        }
+
+        return false;
+}
+
+?>
+ No newline at end of file