Changeset 15703 for trunk/wp-includes/user.php

Timestamp:

10/04/2010 09:59:53 AM (16 years ago)

Author:

dd32

Message:

Simplify get_user_metavalues() to entirely rely upon the Metadata API, Removes a direct SQL Query. de-serializing is handled by the Metadata API now.

File:

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

trunk/wp-includes/user.php

@@ -1052 +1052 @@
  */
 function get_user_metavalues($ids) {
-        global $wpdb;
-
         $objects = array();
 
@@ -1060 +1058 @@
                 $objects[$id] = array();
 
-        if ( 0 == count($ids) ) {
-                return $objects;
-        } elseif ( 1 == count($ids) ) {
-                // Take advantage of the single-user cache
-                $id = $ids[0];
+        update_meta_cache('user', $ids);
+
+        foreach ( $ids as $id ) {
                 $meta = get_metadata('user', $id);
-                foreach ( $meta as $key => $metavalues )
-                        foreach ( $metavalues as $value )
+                foreach ( $meta as $key => $metavalues ) {
+                        foreach ( $metavalues as $value ) {
                                 $objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
-
-                return $objects;
-        }
-
-        $list = implode(',', $ids);
-
-        $show = $wpdb->hide_errors();
-        $metavalues = $wpdb->get_results("SELECT user_id, meta_key, meta_value FROM $wpdb->usermeta WHERE user_id IN ($list)");
-        $wpdb->show_errors($show);
-
-        foreach ( $metavalues as $meta_object )
-                $objects[$meta_object->user_id][] = $meta_object;
+                        }
+                }
+        }
 
         return $objects;
@@ -1096 +1083 @@
 
         foreach ( $metavalues as $meta ) {
-                $value = maybe_unserialize($meta->meta_value);
                 // Keys used as object vars cannot have dashes.
                 $key = str_replace('-', '', $meta->meta_key);