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

Timestamp:

10/05/2009 01:08:06 AM (14 years ago)

Author:

azaozz

Message:

Fix delete_metadata(), see #2659

File:

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

trunk/wp-includes/meta.php

@@ -81 +81 @@
 }
 
-function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '') {
-    if ( !$meta_type || !$meta_key )
-        return false;
-
-    if ( ! $table = _get_meta_table($meta_type) )
-        return false;
-
-    global $wpdb;
-
-    $column = esc_sql($meta_type . '_id');
+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;
 
     // expected_slashed ($meta_key)
@@ -98 +96 @@
     $query = $wpdb->prepare( "SELECT meta_id FROM $table WHERE meta_key = %s", $meta_key );
 
+    if ( !$delete_all )
+        $query .= $wpdb->prepare(" AND %s = %d", $meta_type . '_id', $object_id );
+
     if ( $meta_value )
-        $query .= $wpdb->prepare("AND meta_value = %s", $meta_value );
+        $query .= $wpdb->prepare(" AND meta_value = %s", $meta_value );
 
     $meta_ids = $wpdb->get_col( $query );