Changeset 49303

Timestamp:

10/24/2020 10:44:38 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API, XML-RPC: Synchronise empty comment content checks.

The REST API and XML-RPC now uses the same detection methodology for empty comment content as wp_handle_comment_submission(). Specifically, comments now have their content trimmed and '0' is allowed.

Props jaswrks, rmccue, dd32, rachelbaker, Cawa-93, aduth, TimothyBlynJacobs.
Fixes #43177.

Location:

trunk

Files:

• src/wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (3 diffs)
• tests/phpunit/tests/rest-api/rest-comments-controller.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/wp/newComment.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -3877 +3877 @@
         }
 
-        if ( empty( $content_struct['content'] ) ) {
-            return new IXR_Error( 403, __( 'Comment is required.' ) );
-        }
-
         $comment = array(
             'comment_post_ID' => $post_id,
-            'comment_content' => $content_struct['content'],
+            'comment_content' => ,
         );
 
@@ -3923 +3919 @@
 
         $comment['comment_parent'] = isset( $content_struct['comment_parent'] ) ? absint( $content_struct['comment_parent'] ) : 0;
+
+
+
+
+
+
+
 
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -588 +588 @@
         $prepared_comment['comment_type'] = 'comment';
 
-        /*
-         * Do not allow a comment to be created with missing or empty
-         * comment_content. See wp_handle_comment_submission().
-         */
-        if ( empty( $prepared_comment['comment_content'] ) ) {
+        
+        
+        
+
+        if (  ) ) {
             return new WP_Error(
                 'rest_comment_content_invalid',
@@ -1281 +1281 @@
          */
         if ( isset( $request['content'] ) && is_string( $request['content'] ) ) {
-            $prepared_comment['comment_content'] = $request['content'];
+            $prepared_comment['comment_content'] = ;
         } elseif ( isset( $request['content']['raw'] ) && is_string( $request['content']['raw'] ) ) {
-            $prepared_comment['comment_content'] = $request['content']['raw'];
+            $prepared_comment['comment_content'] = ;
         }
 
@@ -1867 +1867 @@
         return $email;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -1399 +1399 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     public function test_create_item_invalid_date() {
         wp_set_current_user( self::$admin_id );

trunk/tests/phpunit/tests/xmlrpc/wp/newComment.php

@@ -51 +51 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     function test_new_comment_post_closed() {
         $post = self::factory()->post->create_and_get(