From e7c1553bdef336d12b88d1a885f2feefbdf13582 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 24 Jul 2018 17:08:26 +0000
Subject: [PATCH] Privacy: Revert [43525].

The commenter cookies checkbox is not legally required, so should be disabled by default.

Merges [43531] to the 4.9 branch.
Fixes #44373.
Built from https://develop.svn.wordpress.org/branches/4.9@43532


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php     | 3 +++
 wp-admin/options-discussion.php  | 7 +++++++
 wp-admin/options.php             | 1 +
 wp-includes/comment-template.php | 2 +-
 wp-includes/version.php          | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 2d048efbbf..b93fad35b4 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -519,6 +519,9 @@ 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/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 5f57819d4f..be8034f405 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -77,6 +77,13 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 ); ?>
 </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/wp-admin/options.php b/wp-admin/options.php
index 13ecde9b9d..607fe81a4e 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -116,6 +116,7 @@ $whitelist_options = array(
 		'default_comments_page',
 		'comment_order',
 		'comment_registration',
+		'show_comments_cookies_opt_in',
 	),
 	'media' => array(
 		'thumbnail_size_w',
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 6b025befbf..5bcbcd674e 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2205,7 +2205,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' ) ) {
+	if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
 		$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/wp-includes/version.php b/wp-includes/version.php
index ca185229b1..df845f4828 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.8-beta2-43530';
+$wp_version = '4.9.8-beta2-43532';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.