From 9427bc49790adb1414efe86fb0d2fb9c60cfee18 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 9 Mar 2018 15:56:25 +0000
Subject: [PATCH] Respect the commenter decision when they have checked the
 checkbox to consent to cookies, and keep it checked when they reload the page
 or post another comment.

See #43436.

git-svn-id: https://develop.svn.wordpress.org/trunk@42815 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/comment-template.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index 52f1e11521..671c2298e5 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -2260,6 +2260,7 @@ function comment_form( $args = array(), $post_id = null ) {
 	$req      = get_option( 'require_name_email' );
 	$html_req = ( $req ? " required='required'" : '' );
 	$html5    = 'html5' === $args['format'];
+	$consent  = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
 	$fields   = array(
 		'author'  => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
 					 '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
@@ -2268,7 +2269,7 @@ function comment_form( $args = array(), $post_id = null ) {
 		'url'     => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
 					 '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 		'cookies' => '<p class="comment-form-cookies-consent"><label for="wp-comment-cookies-consent">' .
-					 '<input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes" />' .
+					 '<input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
 					 __( 'Save my name, email, and site URL in my browser for next time I post a comment.' ) . '</label></p>',
 	);