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

Timestamp:

10/04/2010 07:38:32 AM (14 years ago)

Author:

dd32

Message:

get_user_metavalues(): Use cached user objects when querying for a single user, Prevents duplicate usermeta queries from Adminbar. Whitespace & s/AS/as/. See #14772

File:

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

trunk/wp-includes/user.php

@@ -652 +652 @@
     // Index the blogs by userblog_id and set the visibility flag
     // Visibility is on by default, unless a linked site then off
-    foreach ( $blogs AS $blog ) {
+    foreach ( $blogs as $blog ) {
         $blog->visible = true;
 
@@ -662 +662 @@
 
     // Add the blogs to our list by order
-    foreach ( (array)$order AS $id ) {
+    foreach ( (array)$order as $id ) {
         // A previous change was saving the entire blog details into ordered, not just the blog ID - this detects it
         if ( is_object( $id ) && isset( $id->userblog_id ) )
@@ -674 +674 @@
 
     // Add any blog not yet ordered to the end
-    foreach ( $newblogs AS $blog ) {
+    foreach ( $newblogs as $blog ) {
         $ordered[$blog->userblog_id] = $blog;
     }
@@ -680 +680 @@
     // If we're only interested in visible blogs then remove the rest
     if ( $visibility ) {
-        foreach ( (array)$ordered AS $pos => $blog ) {
+        foreach ( (array)$ordered as $pos => $blog ) {
             if ( $blog->visible == false )
                 unset( $ordered[$pos] );
@@ -1054 +1054 @@
     global $wpdb;
 
-    $clean = array_map('intval', $ids);
-    if ( 0 == count($clean) )
+    $objects = array();
+
+    $ids = array_map('intval', $ids);
+    foreach ( $ids as $id )
+        $objects[$id] = array();
+
+    if ( 0 == count($ids) ) {
         return $objects;
-
-    $list = implode(',', $clean);
+    } elseif ( 1 == count($ids) ) {
+        // Take advantage of the single-user cache
+        $id = $ids[0];
+        $meta = get_metadata('user', $id);
+        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();
@@ -1064 +1079 @@
     $wpdb->show_errors($show);
 
-    $objects = array();
-    foreach($clean as $id) {
-        $objects[$id] = array();
-    }
-    foreach($metavalues as $meta_object) {
+    foreach ( $metavalues as $meta_object )
         $objects[$meta_object->user_id][] = $meta_object;
-    }
 
     return $objects;
@@ -1115 +1125 @@
 function _fill_many_users( &$users ) {
     $ids = array();
-    foreach($users as $user_object) {
+    foreach( $users as $user_object ) {
         $ids[] = $user_object->ID;
     }
@@ -1121 +1131 @@
     $metas = get_user_metavalues($ids);
 
-    foreach($users as $user_object) {
-        if (isset($metas[$user_object->ID])) {
+    foreach ( $users as $user_object ) {
+        if ( isset($metas[$user_object->ID]) ) {
             _fill_single_user($user_object, $metas[$user_object->ID]);
         }