Changeset 43449

Timestamp:

07/16/2018 12:06:02 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Privacy: do not show the comment cookies opt-in checkbox (on the front-end comments form) when comment cookies are disabled.

Props felipeelia, johnbillion.
Merges [43370] to the 4.9 branch.
Fixes #44342.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (2 diffs)

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

@@ -2197 +2197 @@
     $html_req = ( $req ? " required='required'" : '' );
     $html5    = 'html5' === $args['format'];
-    $consent  = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
     $fields   =  array(
         'author'  => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
@@ -2205 +2204 @@
         'url'     => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
                      '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
-        '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>',
     );
 
-    $required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+    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>';
+    }
+
+    $required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
 
     /**