<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15698] trunk/wp-includes/user.php: get_user_metavalues():
Use cached user objects when querying for a single user,
Prevents duplicate usermeta queries from Adminbar.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15698">15698</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-04 07:38:32 +0000 (Mon, 04 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>get_user_metavalues(): Use cached user objects when querying for a single user, Prevents duplicate usermeta queries from Adminbar. Whitespace & s/AS/as/. See <a href="http://trac.wordpress.org/ticket/14772">#14772</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15697 => 15698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-10-04 04:26:58 UTC (rev 15697)
+++ trunk/wp-includes/user.php 2010-10-04 07:38:32 UTC (rev 15698)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx">
</span><span class="cx"> // Index the blogs by userblog_id and set the visibility flag
</span><span class="cx"> // Visibility is on by default, unless a linked site then off
</span><del>- foreach ( $blogs AS $blog ) {
</del><ins>+ foreach ( $blogs as $blog ) {
</ins><span class="cx"> $blog->visible = true;
</span><span class="cx">
</span><span class="cx"> if ( isset( $visible[$blog->userblog_id] ) )
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add the blogs to our list by order
</span><del>- foreach ( (array)$order AS $id ) {
</del><ins>+ foreach ( (array)$order as $id ) {
</ins><span class="cx"> // A previous change was saving the entire blog details into ordered, not just the blog ID - this detects it
</span><span class="cx"> if ( is_object( $id ) && isset( $id->userblog_id ) )
</span><span class="cx"> $id = $id->userblog_id;
</span><span class="lines">@@ -673,13 +673,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add any blog not yet ordered to the end
</span><del>- foreach ( $newblogs AS $blog ) {
</del><ins>+ foreach ( $newblogs as $blog ) {
</ins><span class="cx"> $ordered[$blog->userblog_id] = $blog;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we're only interested in visible blogs then remove the rest
</span><span class="cx"> if ( $visibility ) {
</span><del>- foreach ( (array)$ordered AS $pos => $blog ) {
</del><ins>+ foreach ( (array)$ordered as $pos => $blog ) {
</ins><span class="cx"> if ( $blog->visible == false )
</span><span class="cx"> unset( $ordered[$pos] );
</span><span class="cx"> }
</span><span class="lines">@@ -1053,23 +1053,33 @@
</span><span class="cx"> function get_user_metavalues($ids) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- $clean = array_map('intval', $ids);
- if ( 0 == count($clean) )
</del><ins>+ $objects = array();
+
+ $ids = array_map('intval', $ids);
+ foreach ( $ids as $id )
+ $objects[$id] = array();
+
+ if ( 0 == count($ids) ) {
</ins><span class="cx"> return $objects;
</span><ins>+ } 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);
</ins><span class="cx">
</span><del>- $list = implode(',', $clean);
</del><ins>+ return $objects;
+ }
</ins><span class="cx">
</span><ins>+ $list = implode(',', $ids);
+
</ins><span class="cx"> $show = $wpdb->hide_errors();
</span><span class="cx"> $metavalues = $wpdb->get_results("SELECT user_id, meta_key, meta_value FROM $wpdb->usermeta WHERE user_id IN ($list)");
</span><span class="cx"> $wpdb->show_errors($show);
</span><span class="cx">
</span><del>- $objects = array();
- foreach($clean as $id) {
- $objects[$id] = array();
- }
- foreach($metavalues as $meta_object) {
</del><ins>+ foreach ( $metavalues as $meta_object )
</ins><span class="cx"> $objects[$meta_object->user_id][] = $meta_object;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return $objects;
</span><span class="cx"> }
</span><span class="lines">@@ -1114,14 +1124,14 @@
</span><span class="cx"> */
</span><span class="cx"> function _fill_many_users( &$users ) {
</span><span class="cx"> $ids = array();
</span><del>- foreach($users as $user_object) {
</del><ins>+ foreach( $users as $user_object ) {
</ins><span class="cx"> $ids[] = $user_object->ID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $metas = get_user_metavalues($ids);
</span><span class="cx">
</span><del>- foreach($users as $user_object) {
- if (isset($metas[$user_object->ID])) {
</del><ins>+ foreach ( $users as $user_object ) {
+ if ( isset($metas[$user_object->ID]) ) {
</ins><span class="cx"> _fill_single_user($user_object, $metas[$user_object->ID]);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>