Changeset 47626

Timestamp:

04/26/2020 01:42:03 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Comments: Ensure that inserting a comment with an empty type results in correct comment type.

Add unit tests for wp_handle_comment_submission() and wp_insert_comment() receiving an empty type.

Follow-up to [47597].

Props ocean90, imath.
Fixes #49236.

Location:

trunk

Files:

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

trunk/src/wp-includes/comment.php

@@ -1913 +1913 @@
         $comment_approved = ! isset( $data['comment_approved'] ) ? 1 : $data['comment_approved'];
         $comment_agent    = ! isset( $data['comment_agent'] ) ? '' : $data['comment_agent'];
-        $comment_type     = ! isset( $data['comment_type'] ) ? 'comment' : $data['comment_type'];
+        $comment_type     = empty( $data['comment_type'] ) ? 'comment' : $data['comment_type'];
         $comment_parent   = ! isset( $data['comment_parent'] ) ? 0 : $data['comment_parent'];
 

trunk/tests/phpunit/tests/comment-submission.php

@@ -714 +714 @@
                 $this->assertWPError( $comment );
                 $this->assertSame( $error, $comment->get_error_code() );
+        }
+
+        /**
+         * @ticket 49236
+         */
+        public function test_submitting_comment_with_empty_type_results_in_correct_type() {
+                $data    = array(
+                        'comment_post_ID' => self::$post->ID,
+                        'comment'         => 'Comment',
+                        'author'          => 'Comment Author',
+                        'email'           => 'comment@example.org',
+                        'comment_type'    => '',
+                );
+                $comment = wp_handle_comment_submission( $data );
+
+                $this->assertNotWPError( $comment );
+                $this->assertInstanceOf( 'WP_Comment', $comment );
+
+                $this->assertSame( 'comment', $comment->comment_type );
+        }
+
+        /**
+         * @ticket 49236
+         */
+        public function test_inserting_comment_with_empty_type_results_in_correct_type() {
+                $data       = array(
+                        'comment_post_ID' => self::$post->ID,
+                        'comment'         => 'Comment',
+                        'author'          => 'Comment Author',
+                        'email'           => 'comment@example.org',
+                        'comment_type'    => '',
+                );
+                $comment_id = wp_insert_comment( $data );
+                $comment    = get_comment( $comment_id );
+
+                $this->assertNotWPError( $comment );
+                $this->assertInstanceOf( 'WP_Comment', $comment );
+
+                $this->assertSame( 'comment', $comment->comment_type );
         }