Changeset 11999

Timestamp:

10/06/2009 07:18:21 PM (15 years ago)

Author:

westi

Message:

Fix the specification of the object_type column in delete_metadata so that it will delete stuff if $delete_all is false. See #2659

File:

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

trunk/wp-includes/meta.php

@@ -82 +82 @@
 
 function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) {
-    if ( !$meta_type || !$meta_key || (!$delete_all && ! (int)$object_id) )
-        return false;
-
-    if ( ! $table = _get_meta_table($meta_type) )
-        return false;
-
-    global $wpdb;
-
+    if ( !$meta_type || !$meta_key || (!$delete_all && ! (int)$object_id) ) 
+        return false;
+    
+    if ( ! $table = _get_meta_table($meta_type) )
+        return false;
+
+    global $wpdb;
+
+    $type_column = esc_sql($meta_type . '_id');
     // expected_slashed ($meta_key)
     $meta_key = stripslashes($meta_key);
@@ -97 +98 @@
 
     if ( !$delete_all )
-        $query .= $wpdb->prepare(" AND %s = %d", $meta_type . '_id', $object_id );
+        $query .= $wpdb->prepare(" AND $type_column = %d", $object_id );
 
     if ( $meta_value )