From 335b69cedc8a828af1e2c4fa841fcafac6700fbb Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 24 Jul 2018 12:50:55 +0000
Subject: [PATCH] Privacy: Remove the setting to enable comment cookies consent
 added in [43469].

This needs some more work to ensure expected behaviour.

See #44373.

git-svn-id: https://develop.svn.wordpress.org/trunk@43525 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/schema.php            | 3 ---
 src/wp-admin/options-discussion.php         | 7 -------
 src/wp-admin/options.php                    | 1 -
 src/wp-includes/comment-template.php        | 2 +-
 tests/phpunit/tests/comment/commentForm.php | 4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index a41f9b5e5b..4be5d5399a 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -535,9 +535,6 @@ function populate_options() {
 
 		// 4.9.6
 		'wp_page_for_privacy_policy'      => 0,
-
-		// 4.9.8
-		'show_comments_cookies_opt_in'    => 0,
 	);
 
 	// 3.3
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 48fb552bb8..c98c441103 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -85,13 +85,6 @@ printf(
 ?>
 </label>
 <br />
-
-<label for="show_comments_cookies_opt_in">
-<input name="show_comments_cookies_opt_in" type="checkbox" id="show_comments_cookies_opt_in" value="1" <?php checked( '1', get_option( 'show_comments_cookies_opt_in' ) ); ?> />
-<?php _e( 'Show comments cookies opt-in checkbox.' ); ?>
-</label>
-<br />
-
 <label for="thread_comments">
 <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> />
 <?php
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
index 95f913f496..1bb24b93bf 100644
--- a/src/wp-admin/options.php
+++ b/src/wp-admin/options.php
@@ -116,7 +116,6 @@ $whitelist_options = array(
 		'default_comments_page',
 		'comment_order',
 		'comment_registration',
-		'show_comments_cookies_opt_in',
 	),
 	'media' => array(
 		'thumbnail_size_w',
diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index 1f7596dc55..19df07d160 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -2271,7 +2271,7 @@ function comment_form( $args = array(), $post_id = null ) {
 					 '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
-	if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
+	if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) ) {
 		$consent           = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
 		$fields['cookies'] = '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
 							 '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';
diff --git a/tests/phpunit/tests/comment/commentForm.php b/tests/phpunit/tests/comment/commentForm.php
index 0fabd97a6a..45f83a4d17 100644
--- a/tests/phpunit/tests/comment/commentForm.php
+++ b/tests/phpunit/tests/comment/commentForm.php
@@ -87,8 +87,6 @@ class Tests_Comment_CommentForm extends WP_UnitTestCase {
 	public function test_fields_should_include_cookies_consent() {
 		$p = self::factory()->post->create();
 
-		add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
-
 		$args = array(
 			'fields' => array(
 				'author' => 'Hello World!',
@@ -96,8 +94,6 @@ class Tests_Comment_CommentForm extends WP_UnitTestCase {
 		);
 		$form = get_echo( 'comment_form', array( $args, $p ) );
 
-		remove_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
-
 		$this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
 	}
 }