Changeset 36039

Timestamp:

12/21/2015 02:57:06 AM (11 years ago)

Author:

johnbillion

Message:

Comments: When a comment is submitted, ensure the user_ID element in the array that's passed to the preprocess_comment filter gets populated.

Merges [36038] to the 4.4 branch.

Fixes #34997

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/comment.php

@@ -2751 +2751 @@
                 $comment_author_email = $user->user_email;
                 $comment_author_url   = $user->user_url;
-                $user_id              = $user->ID;
+                $user_ID              = $user->ID;
                 if ( current_user_can( 'unfiltered_html' ) ) {
                         if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
@@ -2788 +2788 @@
                 'comment_type',
                 'comment_parent',
-                'user_id'
+                'user_ID'
         );
 

branches/4.4/tests/phpunit/tests/comment-submission.php

@@ -5 +5 @@
  */
 class Tests_Comment_Submission extends WP_UnitTestCase {
+
+        protected $preprocess_comment_data = array();
 
         function setUp() {
@@ -591 +593 @@
         }
 
+        /**
+         * @ticket 34997
+         */
+        public function test_comment_submission_sends_all_expected_parameters_to_preprocess_comment_filter() {
+
+                $user = self::factory()->user->create_and_get( array(
+                        'role' => 'author',
+                ) );
+                wp_set_current_user( $user->ID );
+
+                $post = self::factory()->post->create_and_get();
+                $data = array(
+                        'comment_post_ID' => $post->ID,
+                        'comment'         => 'Comment',
+                );
+
+                add_filter( 'preprocess_comment', array( $this, 'filter_preprocess_comment' ) );
+
+                $comment = wp_handle_comment_submission( $data );
+
+                remove_filter( 'preprocess_comment', array( $this, 'filter_preprocess_comment' ) );
+
+                $this->assertNotWPError( $comment );
+                $this->assertEquals( array(
+                        'comment_post_ID'      => $post->ID,
+                        'comment_author'       => $user->display_name,
+                        'comment_author_email' => $user->user_email,
+                        'comment_author_url'   => $user->user_url,
+                        'comment_content'      => $data['comment'],
+                        'comment_type'         => '',
+                        'comment_parent'       => '0',
+                        'user_ID'              => $user->ID,
+                        'user_id'              => $user->ID,
+                ), $this->preprocess_comment_data );
+
+        }
+
+        public function filter_preprocess_comment( $commentdata ) {
+                $this->preprocess_comment_data = $commentdata;
+                return $commentdata;
+        }
+
 }