From d70c159c96eff889920507f3f58444275bbad090 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Mon, 21 Jan 2019 22:56:31 +0000
Subject: [PATCH] Comments: Default the `show_comments_cookies_opt_in` checkbox
 to enabled.

This also updates the option label, to clarify that it needs to be enabled for comment cookies to work.

Props azaozz, pento, dhavalkasvala, desrosj, pputzer, mirkoschubert, ThemeZee.
Fixes #44736.



git-svn-id: https://develop.svn.wordpress.org/trunk@44683 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/schema.php    | 2 +-
 src/wp-admin/options-discussion.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index 544a9221d1..3fc0560b93 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -541,7 +541,7 @@ function populate_options( array $options = array() ) {
 		'wp_page_for_privacy_policy'      => 0,
 
 		// 4.9.8
-		'show_comments_cookies_opt_in'    => 0,
+		'show_comments_cookies_opt_in'    => 1,
 	);
 
 	// 3.3
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 48fb552bb8..3f7683e6ba 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -88,7 +88,7 @@ printf(
 
 <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.' ); ?>
+<?php _e( 'Show comments cookies opt-in checkbox, allowing comment author cookies to be set.' ); ?>
 </label>
 <br />