Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This needs some more work to ensure expected behaviour.

Merges [43525] to the 4.9 branch.
See #44373.
Built from https://develop.svn.wordpress.org/branches/4.9@43526


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43355 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-07-24 12:53:26 +00:00
parent 92096f4c64
commit c0a7aaf659
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -77,13 +77,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
); ?>
</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')); ?> />
<?php

1
wp-admin/options.php
View File

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

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

@ -2205,7 +2205,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>',
);
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 . ' />' .
'<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.8-beta2-43524';
$wp_version = '4.9.8-beta2-43526';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.