From d68b2b5a2b50b73b32b907e6cd16b434db27e413 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 24 Jul 2018 12:51:29 +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.
Built from https://develop.svn.wordpress.org/trunk@43525


git-svn-id: http://core.svn.wordpress.org/trunk@43354 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, 2 insertions(+), 13 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index a41f9b5e5b..4be5d5399a 100644
--- a/wp-admin/includes/schema.php
+++ b/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/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 48fb552bb8..c98c441103 100644
--- a/wp-admin/options-discussion.php
+++ b/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/wp-admin/options.php b/wp-admin/options.php
index 95f913f496..1bb24b93bf 100644
--- a/wp-admin/options.php
+++ b/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/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 1f7596dc55..19df07d160 100644
--- a/wp-includes/comment-template.php
+++ b/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/wp-includes/version.php b/wp-includes/version.php
index f49e92ee90..7df9d6e810 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43521';
+$wp_version = '5.0-alpha-43525';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.