Changeset 43526 for branches/4.9

Timestamp:

07/24/2018 12:52:29 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Remove the setting to enable comment cookies consent added in [43469].

This needs some more work to ensure expected behaviour.

Merges [43525] to the 4.9 branch.
See #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)
• tests/phpunit/tests/comment/commentForm.php (modified) (2 diffs)

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

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

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

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

branches/4.9/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(
@@ -97 +95 @@
                 $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 );
         }