sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Privacy: Revert [43525]. 

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

Fixes #44373.

git-svn-id: https://develop.svn.wordpress.org/trunk@43531 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2018-07-24 17:05:56 +00:00
parent 0f7e947546
commit ddc8f803c6
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-admin/includes/schema.php
View File

@ -535,6 +535,9 @@ function populate_options() {
// 4.9.6 // 4.9.6
'wp_page_for_privacy_policy' => 0, 'wp_page_for_privacy_policy' => 0,
// 4.9.8
'show_comments_cookies_opt_in' => 0,
); );
// 3.3 // 3.3

7
src/wp-admin/options-discussion.php
View File

@ -85,6 +85,13 @@ printf(
?> ?>
</label> </label>
<br /> <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"> <label for="thread_comments">
<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> /> <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> />
<?php <?php

1
src/wp-admin/options.php
View File

@ -116,6 +116,7 @@ $whitelist_options = array(
'default_comments_page', 'default_comments_page',
'comment_order', 'comment_order',
'comment_registration', 'comment_registration',
'show_comments_cookies_opt_in',
), ),
'media' => array( 'media' => array(
'thumbnail_size_w', 'thumbnail_size_w',

2
src/wp-includes/comment-template.php
View File

@ -2271,7 +2271,7 @@ function comment_form( $args = array(), $post_id = null ) {
'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>', '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
); );
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"'; $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 . ' />' . $fields['cookies'] = '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
'<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>'; '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';

4
tests/phpunit/tests/comment/commentForm.php
View File

@ -87,6 +87,8 @@ class Tests_Comment_CommentForm extends WP_UnitTestCase {
public function test_fields_should_include_cookies_consent() { public function test_fields_should_include_cookies_consent() {
$p = self::factory()->post->create(); $p = self::factory()->post->create();
add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
$args = array( $args = array(
'fields' => array( 'fields' => array(
'author' => 'Hello World!', 'author' => 'Hello World!',
@ -94,6 +96,8 @@ class Tests_Comment_CommentForm extends WP_UnitTestCase {
); );
$form = get_echo( 'comment_form', array( $args, $p ) ); $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 ); $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
} }
} }