Ticket #44342: 44342.diff

src/wp-includes/comment-template.php

@@ -2262 +2262 @@
         $req      = get_option( 'require_name_email' );
         $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> ' .
                                          '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
@@ -2270 +2269 @@
                                          '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' /></p>',
                 '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>',
         );
 
+        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>' );
 
         /**