Changeset 43524

Timestamp:

07/24/2018 12:42:33 PM (8 years 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.
Merges [43518] to the 4.9 branch.
Fixes #44126.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/comment-template.php (modified) (1 diff)
• tests/phpunit/tests/comment/commentForm.php (modified) (1 diff)

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

@@ -2210 +2210 @@
                 $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>';
+
+                // Ensure that the passed fields include cookies consent.
+                if ( isset( $args['fields'] ) && ! isset( $args['fields']['cookies'] ) ) {
+                        $args['fields']['cookies'] = $fields['cookies'];
+                }
         }
 

branches/4.9/tests/phpunit/tests/comment/commentForm.php

@@ -81 +81 @@
                 return $defaults;
         }
+
+        /**
+         * @ticket 44126
+         */
+        public function test_fields_should_include_cookies_consent() {
+                $p = self::factory()->post->create();
+
+                add_filter( 'option_show_comments_cookies_opt_in', '__return_true' );
+
+                $args = array(
+                        'fields' => array(
+                                'author' => 'Hello World!',
+                        ),
+                );
+                $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 );
+        }
 }