WordPress.org

Make WordPress Core

Changeset 43518 for trunk


Ignore:
Timestamp:
07/20/2018 12:37:40 AM (17 months ago)
Author:
SergeyBiryukov
Message:

Comments: Ensure that themes overriding default comment_form() fields still display the cookies consent checkbox.

The comment_form_default_fields filter can be used to remove the checkbox.

Props pross, SergeyBiryukov.
Fixes #44126.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment-template.php

    r43469 r43518  
    22762276        $fields['cookies'] = '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
    22772277                             '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';
     2278
     2279        // Ensure that the passed fields include cookies consent.
     2280        if ( isset( $args['fields'] ) && ! isset( $args['fields']['cookies'] ) ) {
     2281            $args['fields']['cookies'] = $fields['cookies'];
     2282        }
    22782283    }
    22792284
  • trunk/tests/phpunit/tests/comment/commentForm.php

    r42343 r43518  
    8181        return $defaults;
    8282    }
     83
     84    /**
     85     * @ticket 44126
     86     */
     87    public function test_fields_should_include_cookies_consent() {
     88        $p = self::factory()->post->create();
     89
     90        add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
     91
     92        $args = array(
     93            'fields' => array(
     94                'author' => 'Hello World!',
     95            ),
     96        );
     97        $form = get_echo( 'comment_form', array( $args, $p ) );
     98
     99        remove_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
     100
     101        $this->assertRegExp( '|<p class="comment\-form\-cookies\-consent">.*?</p>|', $form );
     102    }
    83103}
Note: See TracChangeset for help on using the changeset viewer.