Changeset 43470 for branches/4.9

Timestamp:

07/17/2018 09:29:08 AM (8 years ago)

Author:

azaozz

Message:

Privacy: Add a setting to disable comment cookie consent.

Merges [43469] to the 4.9 branch.
Fixes #44373.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/options-discussion.php (modified) (1 diff)
• src/wp-admin/options.php (modified) (1 diff)
• src/wp-includes/comment-template.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/schema.php

@@ -520 +520 @@
                 // 4.9.6
                 'wp_page_for_privacy_policy'      => 0,
+
+                // 4.9.8
+                'show_comments_cookies_opt_in'    => 0,
         );
 

branches/4.9/src/wp-admin/options-discussion.php

@@ -78 +78 @@
 </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')); ?> />

branches/4.9/src/wp-admin/options.php

@@ -82 +82 @@
 
 $whitelist_options = array(
-        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG', 'new_admin_email' ),
-        'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-        'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-        'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-        'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+        'general' => array(
+                'blogname',
+                'blogdescription',
+                'gmt_offset',
+                'date_format',
+                'time_format',
+                'start_of_week',
+                'timezone_string',
+                'WPLANG',
+                'new_admin_email',
+        ),
+        'discussion' => array(
+                'default_pingback_flag',
+                'default_ping_status',
+                'default_comment_status',
+                'comments_notify',
+                'moderation_notify',
+                'comment_moderation',
+                'require_name_email',
+                'comment_whitelist',
+                'comment_max_links',
+                'moderation_keys',
+                'blacklist_keys',
+                'show_avatars',
+                'avatar_rating',
+                'avatar_default',
+                'close_comments_for_old_posts',
+                'close_comments_days_old',
+                'thread_comments',
+                'thread_comments_depth',
+                'page_comments',
+                'comments_per_page',
+                'default_comments_page',
+                'comment_order',
+                'comment_registration',
+                'show_comments_cookies_opt_in',
+        ),
+        'media' => array(
+                'thumbnail_size_w',
+                'thumbnail_size_h',
+                'thumbnail_crop',
+                'medium_size_w',
+                'medium_size_h',
+                'large_size_w',
+                'large_size_h',
+                'image_default_size',
+                'image_default_align',
+                'image_default_link_type',
+        ),
+        'reading' => array(
+                'posts_per_page',
+                'posts_per_rss',
+                'rss_use_excerpt',
+                'show_on_front',
+                'page_on_front',
+                'page_for_posts',
+                'blog_public',
+        ),
+        'writing' => array(
+                'default_category',
+                'default_email_category',
+                'default_link_category',
+                'default_post_format',
+        ),
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();

branches/4.9/src/wp-includes/comment-template.php

@@ -2206 +2206 @@
         );
 
-        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 . ' />' .