Changeset 43531 for trunk

Timestamp:

07/24/2018 05:05:56 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Revert [43525].

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

Fixes #44373.

Location:

trunk

Files:

• 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)
• tests/phpunit/tests/comment/commentForm.php (modified) (2 diffs)

trunk/src/wp-admin/includes/schema.php

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

trunk/src/wp-admin/options-discussion.php

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

trunk/src/wp-admin/options.php

@@ -117 +117 @@
         'comment_order',
         'comment_registration',
+        'show_comments_cookies_opt_in',
     ),
     'media' => array(

trunk/src/wp-includes/comment-template.php

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

trunk/tests/phpunit/tests/comment/commentForm.php

@@ -88 +88 @@
         $p = self::factory()->post->create();
 
+        add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
+
         $args = array(
             'fields' => array(
@@ -95 +97 @@
         $form = get_echo( 'comment_form', array( $args, $p ) );
 
+        remove_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
+
         $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
     }