Ticket #18819: block-commenter-cookies.diff

wp-comments-post.php

@@ -90 +90 @@
 $comment_id = wp_new_comment( $commentdata );
 
 $comment = get_comment($comment_id);
-if ( !$user->ID ) {
-        $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
-        setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-        setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-        setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+if ( (!defined('BLOCK_COMMENTER_COOKIES')) || (!BLOCK_COMMENTER_COOKIES) ) {
+        if ( !$user->ID ) {
+                $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+                setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+                setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+                setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
+        }
 }
 
 $location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;

wp-includes/comment.php

@@ -1186 +1186 @@
         // Cookies should already be sanitized.
 
         $comment_author = '';
-        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-                $comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
-
         $comment_author_email = '';
-        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-                $comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
-
         $comment_author_url = '';
-        if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-                $comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
+        if ( (!defined('BLOCK_COMMENTER_COOKIES')) || (!BLOCK_COMMENTER_COOKIES) ) {
+                if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+                        $comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+                if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+                        $comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+                if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+                        $comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+        }
+
         return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }