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

Timestamp:

11/10/2016 03:34:30 AM (9 years ago)

Author:

joehoyle

Message:

REST API: Allow updating a comment without the content present.

For all resources in the REST API, sending partial updates is supported. This fixes needing to _always_ specify comment content.

Props jnylen.
Fixes #38720.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (3 diffs)

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

@@ -432 +432 @@
 
         /*
-         * Do not allow a comment to be created with an empty string for
+         * Do not allow a comment to be created with missing or empty
          * comment_content. See wp_handle_comment_submission().
          */
-        if ( '' === $prepared_comment['comment_content'] ) {
+        if ( empty( $prepared_comment['comment_content'] ) ) {
             return new WP_Error( 'rest_comment_content_invalid', __( 'Comment content is invalid.' ), array( 'status' => 400 ) );
         }
@@ -635 +635 @@
             if ( is_wp_error( $prepared_args ) ) {
                 return $prepared_args;
+            }
+
+            if ( isset( $prepared_args['comment_content'] ) && empty( $prepared_args['comment_content'] ) ) {
+                return new WP_Error( 'rest_comment_content_invalid', __( 'Comment content is invalid.' ), array( 'status' => 400 ) );
             }
 
@@ -1063 +1067 @@
                 list( $prepared_comment['comment_date'], $prepared_comment['comment_date_gmt'] ) = $date_data;
             }
-        }
-
-        // Require 'comment_content' unless only the 'comment_status' is being updated.
-        if ( ! empty( $prepared_comment ) && ! isset( $prepared_comment['comment_content'] ) ) {
-            return new WP_Error( 'rest_comment_content_required', __( 'Missing comment content.' ), array( 'status' => 400 ) );
         }