Changeset 16017 for trunk/wp-includes/meta.php

Timestamp:

10/27/2010 05:45:08 PM (14 years ago)

Author:

scribu

Message:

Fix inconsistencies in metadata filters. Props sc0ttkclark. See #14766

File:

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

trunk/wp-includes/meta.php

@@ -45 +45 @@
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
+    $meta_value = stripslashes_deep($meta_value);
 
     $check = apply_filters( "add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique );
@@ -56 +57 @@
 
     $_meta_value = $meta_value;
-    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+    $meta_value = maybe_serialize( $meta_value );
 
     do_action( "add_{$meta_type}_meta", $object_id, $meta_key, $_meta_value );
@@ -112 +113 @@
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
+    $meta_value = stripslashes_deep($meta_value);
 
     $check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value );
@@ -130 +132 @@
 
     $_meta_value = $meta_value;
-    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+    $meta_value = maybe_serialize( $meta_value );
 
     $data  = compact( 'meta_value' );
@@ -187 +189 @@
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
-    $meta_value = maybe_serialize( stripslashes_deep($meta_value) );
+    $meta_value = stripslashes_deep($meta_value);
 
     $check = apply_filters( "delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all );
@@ -193 +195 @@
         return (bool) $check;
 
+    $_meta_value = $meta_value;
+    $meta_value = maybe_serialize( $meta_value );
+
     $query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
 
@@ -205 +210 @@
         return false;
 
-    do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $meta_value );
+    do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
 
     $query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
@@ -219 +224 @@
         clean_user_cache($object_id);
 
-    do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $meta_value );
+    do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
 
     return true;
@@ -246 +251 @@
     $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
     if ( null !== $check ) {
-        if ( !is_array( $check ) )
+        if ( $single && is_array( $check ) )
+            return $check[0];
+        else
             return $check;
-        elseif ( $single )
-            return maybe_unserialize( $check[0] );
-        else
-            return array_map( 'maybe_unserialize', $check );
     }