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' );
); ?>
+
+
+ />
+
+
+
+
/>
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 ) {
'
',
);
- 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'] = '';
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.