Changeset 46249 for trunk/src/wp-includes/rest-api.php

Timestamp:

09/23/2019 05:24:58 PM (5 years ago)

Author:

kadamwhite

Message:

REST API: Pass "null" as the post date property to reset post to initial "floating" date value.

Props TimothyBlynJacobs, adamsilverstein, jnylen0, mnelson4.
Fixes #44975.

File:

• trunk/src/wp-includes/rest-api.php (modified) (4 diffs)

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

@@ -1210 +1210 @@
  */
 function rest_validate_value_from_schema( $value, $args, $param = '' ) {
+    if ( is_array( $args['type'] ) ) {
+        foreach ( $args['type'] as $type ) {
+            $type_args         = $args;
+            $type_args['type'] = $type;
+
+            if ( true === rest_validate_value_from_schema( $value, $type_args, $param ) ) {
+                return true;
+            }
+        }
+
+        /* translators: 1: Parameter, 2: List of types. */
+        return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s' ), $param, implode( ',', $args['type'] ) ) );
+    }
+
     if ( 'array' === $args['type'] ) {
         if ( ! is_null( $value ) ) {
@@ -1260 +1274 @@
             }
         }
+    }
+
+    if ( 'null' === $args['type'] ) {
+        if ( null !== $value ) {
+            /* translators: 1: Parameter, 2: Type name. */
+            return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, 'null' ) );
+        }
+
+        return true;
     }
 
@@ -1366 +1389 @@
  */
 function rest_sanitize_value_from_schema( $value, $args ) {
+    if ( is_array( $args['type'] ) ) {
+        // Determine which type the value was validated against, and use that type when performing sanitization
+        $validated_type = '';
+
+        foreach ( $args['type'] as $type ) {
+            $type_args         = $args;
+            $type_args['type'] = $type;
+
+            if ( ! is_wp_error( rest_validate_value_from_schema( $value, $type_args ) ) ) {
+                $validated_type = $type;
+                break;
+            }
+        }
+
+        if ( ! $validated_type ) {
+            return null;
+        }
+
+        $args['type'] = $validated_type;
+    }
+
     if ( 'array' === $args['type'] ) {
         if ( empty( $args['items'] ) ) {
@@ -1408 +1452 @@
     }
 
+    if ( 'null' === $args['type'] ) {
+        return null;
+    }
+
     if ( 'integer' === $args['type'] ) {
         return (int) $value;