Ticket #41775: allow-comment-types.diff

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

@@ -25 +25 @@
         protected $meta;
 
         /**
+         * List of default allowed comment types
+         *
+         * @since ??
+         * @access private
+         * @var array
+         */
+        private $default_allowed_types;
+
+        /**
          * Constructor.
          *
          * @since 4.7.0
@@ -32 +41 @@
         public function __construct() {
                 $this->namespace = 'wp/v2';
                 $this->rest_base = 'comments';
+                $this->default_allowed_types = array('comment');
 
                 $this->meta = new WP_REST_Comment_Meta_Fields();
         }
@@ -140 +150 @@
                                                 $forbidden_params[] = $param;
                                         }
                                 } elseif ( 'type' === $param ) {
-                                        if ( 'comment' !== $request[ $param ] ) {
+                                        if ( false === in_array($request[ $param ], apply_filters( 'rest_allow_comment_types', $this->default_allowed_types, $request ) ) ) {
                                                 $forbidden_params[] = $param;
                                         }
                                 } elseif ( ! empty( $request[ $param ] ) ) {
@@ -482 +492 @@
                 }
 
                 // Do not allow comments to be created with a non-default type.
-                if ( ! empty( $request['type'] ) && 'comment' !== $request['type'] ) {
+                if ( ! empty( $request['type'] ) && false === in_array($request['type'], apply_filters( 'rest_allow_comment_types', $this->default_allowed_types, $request ) ) ) {
                         return new WP_Error( 'rest_invalid_comment_type', __( 'Cannot create a comment with that type.' ), array( 'status' => 400 ) );
                 }
 
@@ -491 +501 @@
                         return $prepared_comment;
                 }
 
-                $prepared_comment['comment_type'] = '';
-
                 /*
                  * Do not allow a comment to be created with missing or empty
                  * comment_content. See wp_handle_comment_submission().
@@ -673 +681 @@
                 $id = $comment->comment_ID;
 
                 if ( isset( $request['type'] ) && get_comment_type( $id ) !== $request['type'] ) {
-                        return new WP_Error( 'rest_comment_invalid_type', __( 'Sorry, you are not allowed to change the comment type.' ), array( 'status' => 404 ) );
+                        if ( !in_array($request['type'], apply_filters( 'rest_allow_comment_types', $this->default_allowed_types, $request ) ) ) {
+                                return new WP_Error( 'rest_comment_invalid_type', __( 'Sorry, you are not allowed to change the comment type.' ), array( 'status' => 404 ) );
+                        }
                 }
 
                 $prepared_args = $this->prepare_item_for_database( $request );
@@ -1118 +1128 @@
                         }
                 }
 
+                if ( ! empty( $request['type'] ) ) {
+                        $prepared_comment['comment_type'] = $request['type'];
+                }
+
                 /**
                  * Filters a comment after it is prepared for the database.
                  *