Changeset 14547

Timestamp:

05/10/2010 08:51:58 PM (14 years ago)

Author:

nacin

Message:

Revert patch for expecting unslashed data in the metadata API. Had snuck in with [14546]. see #12416.

File:

• trunk/wp-includes/meta.php (modified) (6 diffs)

trunk/wp-includes/meta.php

@@ -22 +22 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key. Expected unslashed.
+ * @param string $meta_key Metadata key
  * @param string $meta_value Metadata value
  * @param bool $unique Optional, default is false.  Whether the specified metadata key should be
@@ -43 +43 @@
     $column = esc_sql($meta_type . '_id');
 
+    // expected_slashed ($meta_key)
+    $meta_key = stripslashes($meta_key);
+
     if ( $unique && $wpdb->get_var( $wpdb->prepare(
         "SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
@@ -80 +83 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key. Expected unslashed.
+ * @param string $meta_key Metadata key
  * @param string $meta_value Metadata value
  * @param string $prev_value Optional.  If specified, only update existing metadata entries with
@@ -100 +103 @@
     $column = esc_sql($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
+
+    // expected_slashed ($meta_key)
+    $meta_key = stripslashes($meta_key);
 
     if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
@@ -138 +144 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key. Expected unslashed.
+ * @param string $meta_key Metadata key
  * @param string $meta_value Optional. Metadata value.  If specified, only delete metadata entries
  *      with this value.  Otherwise, delete all entries with the specified meta_key.
@@ -160 +166 @@
     $type_column = esc_sql($meta_type . '_id');
     $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
-
+    // expected_slashed ($meta_key)
+    $meta_key = stripslashes($meta_key);
     $meta_value = maybe_serialize( stripslashes_deep($meta_value) );