WordPress.org

Make WordPress Core

Changeset 43526


Ignore:
Timestamp:
07/24/2018 12:52:29 PM (2 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:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

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

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

    r43470 r43526  
    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 
    8780<label for="thread_comments">
    8881<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

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

    r43524 r43526  
    22062206    );
    22072207
    2208     if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) && get_option( 'show_comments_cookies_opt_in' ) ) {
     2208    if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) ) {
    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

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