Changeset 44113 for trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php

Timestamp:

12/13/2018 04:29:57 PM (6 years ago)

Author:

desrosj

Message:

REST API: Slash existing meta values when comparing with incoming meta upates.

When comparing the old and new values for a meta key being set, ensure both values are sanitized using the same logic so that equal values match.

props boonebgorges, dcavins, MattGeri, pilou69, TimothyBlynJacobs, kadamwhite.

Merges [43740] to trunk.

Fixes #42069.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php

@@ -318 +318 @@
         }
 
-        $meta_key   = wp_slash( $meta_key );
-        $meta_value = wp_slash( $value );
-
         // Do the exact same check for a duplicate value as in update_metadata() to avoid update_metadata() returning false.
         $old_value = get_metadata( $meta_type, $object_id, $meta_key );
+        $subtype   = get_object_subtype( $meta_type, $object_id );
 
         if ( 1 === count( $old_value ) ) {
-            if ( $old_value[0] === $meta_value ) {
+            if ( (string) sanitize_meta( $meta_key, $value, $meta_type, $subtype ) === $old_value[0] ) {
                 return true;
             }
         }
 
-        if ( ! update_metadata( $meta_type, $object_id, $meta_key, $meta_value ) ) {
+        if ( ! update_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash( $value ) ) ) {
             return new WP_Error(
                 'rest_meta_database_error',