WordPress.org

Make WordPress Core

Changeset 43532 for branches/4.9


Ignore:
Timestamp:
07/24/2018 05:07:19 PM (2 years ago)
Author:
SergeyBiryukov
Message:

Privacy: Revert [43525].

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

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

Location:
branches/4.9
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

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

    r43526 r43532  
    520520        // 4.9.6
    521521        'wp_page_for_privacy_policy'      => 0,
     522
     523        // 4.9.8
     524        'show_comments_cookies_opt_in'    => 0,
    522525    );
    523526
  • branches/4.9/src/wp-admin/options-discussion.php

    r43526 r43532  
    7878</label>
    7979<br />
     80
     81<label for="show_comments_cookies_opt_in">
     82<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' ) ); ?> />
     83<?php _e( 'Show comments cookies opt-in checkbox.' ); ?>
     84</label>
     85<br />
     86
    8087<label for="thread_comments">
    8188<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

    r43526 r43532  
    117117        'comment_order',
    118118        'comment_registration',
     119        'show_comments_cookies_opt_in',
    119120    ),
    120121    'media' => array(
  • branches/4.9/src/wp-includes/comment-template.php

    r43526 r43532  
    22062206    );
    22072207
    2208     if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) ) {
     2208    if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
    22092209        $consent           = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
    22102210        $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

    r43526 r43532  
    8888        $p = self::factory()->post->create();
    8989
     90        add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
     91
    9092        $args = array(
    9193            'fields' => array(
     
    9597        $form = get_echo( 'comment_form', array( $args, $p ) );
    9698
     99        remove_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
     100
    97101        $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
    98102    }
Note: See TracChangeset for help on using the changeset viewer.