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

Timestamp:

10/24/2020 10:44:38 PM (5 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.

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

@@ -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 ( ! isset( $prepared_comment['comment_content'] ) ) {
+            $prepared_comment['comment_content'] = '';
+        }
+
+        if ( ! $this->check_is_comment_content_allowed( $prepared_comment ) ) {
             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'] = trim( $request['content'] );
         } elseif ( isset( $request['content']['raw'] ) && is_string( $request['content']['raw'] ) ) {
-            $prepared_comment['comment_content'] = $request['content']['raw'];
+            $prepared_comment['comment_content'] = trim( $request['content']['raw'] );
         }
 
@@ -1867 +1867 @@
         return $email;
     }
+
+    /**
+     * If empty comments are not allowed, checks if the provided comment content is not empty.
+     *
+     * @since 5.6.0
+     *
+     * @param array $prepared_comment The prepared comment data.
+     * @return bool True if the content is allowed, false otherwise.
+     */
+    protected function check_is_comment_content_allowed( $prepared_comment ) {
+        $check = wp_parse_args(
+            $prepared_comment,
+            array(
+                'comment_post_ID'      => 0,
+                'comment_parent'       => 0,
+                'user_ID'              => 0,
+                'comment_author'       => null,
+                'comment_author_email' => null,
+                'comment_author_url'   => null,
+            )
+        );
+
+        /** This filter is documented in wp-includes/comment.php */
+        $allow_empty = apply_filters( 'allow_empty_comment', false, $check );
+
+        if ( $allow_empty ) {
+            return true;
+        }
+
+        /*
+         * Do not allow a comment to be created with missing or empty
+         * comment_content. See wp_handle_comment_submission().
+         */
+        return '' !== $check['comment_content'];
+    }
 }