Changeset 49329 for trunk/src/wp-includes/rest-api/class-wp-rest-request.php

Timestamp:

10/27/2020 04:42:38 PM (6 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Support a broader range of JSON media types.

Previously, we only supported application/json which prevented using subtypes like application/activity+json. This allows for the REST API to json_decode the body of requests using a JSON subtype Content-Type. Additionally, wp_die() now properly sends the error as JSON when a JSON subtype is specified in the Accept header.

Props pfefferle.
Fixes #49404.

File:

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

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -325 +325 @@
 
         /**
+         * Checks if the request has specified a JSON content-type.
+         *
+         * @since 5.6.0
+         *
+         * @return bool True if the content-type header is JSON.
+         */
+        public function is_json_content_type() {
+                $content_type = $this->get_content_type();
+
+                return isset( $content_type['value'] ) && wp_is_json_media_type( $content_type['value'] );
+        }
+
+        /**
          * Retrieves the parameter priority order.
          *
@@ -336 +349 @@
                 $order = array();
 
-                $content_type = $this->get_content_type();
-                if ( isset( $content_type['value'] ) && 'application/json' === $content_type['value'] ) {
+                if ( $this->is_json_content_type() ) {
                         $order[] = 'JSON';
                 }
@@ -659 +671 @@
 
                 // Check that we actually got JSON.
-                $content_type = $this->get_content_type();
-
-                if ( empty( $content_type ) || 'application/json' !== $content_type['value'] ) {
+                if ( ! $this->is_json_content_type() ) {
                         return true;
                 }