Changeset 49188

Timestamp:

10/18/2020 06:55:16 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Deprecate wp_slash_strings_only() in favor of wp_slash().

The reason for introducing wp_slash_strings_only() in [46454] was to keep non-string values untouched.

Later, wp_slash() itself was updated in [48433] to prevent changing non-string values.

To avoid confusion, wp_slash_strings_only() is now deprecated.

Props ayeshrajans, ocean90.
Fixes #50635.

Location:

trunk/src/wp-includes

Files:

• deprecated.php (modified) (1 diff)
• formatting.php (modified) (1 diff)
• rest-api/fields/class-wp-rest-meta-fields.php (modified) (1 diff)

trunk/src/wp-includes/deprecated.php

@@ -4102 +4102 @@
     return remove_allowed_options( $del_options, $options );
 }
+
+/**
+ * Adds slashes to only string values in an array of values.
+ *
+ * This should be used when preparing data for core APIs that expect slashed data.
+ * This should not be used to escape data going directly into an SQL query.
+ *
+ * @since 5.3.0
+ * @deprecated 5.6.0 Use wp_slash()
+ *
+ * @see wp_slash()
+ *
+ * @param mixed $value Scalar or array of scalars.
+ * @return mixed Slashes $value
+ */
+function wp_slash_strings_only( $value ) {
+    return map_deep( $value, 'addslashes_strings_only' );
+}
+
+/**
+ * Adds slashes only if the provided value is a string.
+ *
+ * @since 5.3.0
+ * @deprecated 5.6.0
+ *
+ * @see wp_slash()
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+function addslashes_strings_only( $value ) {
+    return is_string( $value ) ? addslashes( $value ) : $value;
+}

trunk/src/wp-includes/formatting.php

@@ -5547 +5547 @@
 
 /**
- * Adds slashes to only string values in an array of values.
- *
- * This should be used when preparing data for core APIs that expect slashed data.
- * This should not be used to escape data going directly into an SQL query.
- *
- * @since 5.3.0
- *
- * @param mixed $value Scalar or array of scalars.
- * @return mixed Slashes $value
- */
-function wp_slash_strings_only( $value ) {
-    return map_deep( $value, 'addslashes_strings_only' );
-}
-
-/**
- * Adds slashes only if the provided value is a string.
- *
- * @since 5.3.0
- *
- * @param mixed $value
- * @return mixed
- */
-function addslashes_strings_only( $value ) {
-    return is_string( $value ) ? addslashes( $value ) : $value;
-}
-
-/**
  * Extract and return the first URL from passed content.
  *

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

@@ -373 +373 @@
         }
 
-        if ( ! update_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash_strings_only( $value ) ) ) {
+        if ( ! update_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash( $value ) ) ) {
             return new WP_Error(
                 'rest_meta_database_error',