Changeset 12562

Timestamp:

12/28/2009 04:42:31 PM (15 years ago)

Author:

ryan

Message:

Use umeta_id for user meta. Props wnorris. fixes #11627 for trunk

File:

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

trunk/wp-includes/meta.php

@@ -54 +54 @@
 
     $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 meta_id FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
+    if ( ! $meta_id = $wpdb->get_var( $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s AND $column = %d", $meta_key, $object_id ) ) )
         return add_metadata($meta_type, $object_id, $meta_key, $meta_value);
 
@@ -91 +92 @@
 
     $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) );
 
-    $query = $wpdb->prepare( "SELECT meta_id FROM $table WHERE meta_key = %s", $meta_key );
+    $query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
 
     if ( !$delete_all )
@@ -107 +109 @@
         return false;
 
-    $query = "DELETE FROM $table WHERE meta_id IN( " . implode( ',', $meta_ids ) . " )";
+    $query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
 
     $count = $wpdb->query($query);