<!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>[15703] trunk/wp-includes/user.php: Simplify get_user_metavalues()
to entirely rely upon the Metadata API, Removes a direct SQL Query.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15703">15703</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-04 09:59:53 +0000 (Mon, 04 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</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 (15702 => 15703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-10-04 09:43:02 UTC (rev 15702)
+++ trunk/wp-includes/user.php 2010-10-04 09:59:53 UTC (rev 15703)
</span><span class="lines">@@ -1051,36 +1051,23 @@
</span><span class="cx"> * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
</span><span class="cx"> */
</span><span class="cx"> function get_user_metavalues($ids) {
</span><del>- global $wpdb;
-
</del><span class="cx"> $objects = array();
</span><span class="cx">
</span><span class="cx"> $ids = array_map('intval', $ids);
</span><span class="cx"> foreach ( $ids as $id )
</span><span class="cx"> $objects[$id] = array();
</span><span class="cx">
</span><del>- if ( 0 == count($ids) ) {
- return $objects;
- } elseif ( 1 == count($ids) ) {
- // Take advantage of the single-user cache
- $id = $ids[0];
</del><ins>+ update_meta_cache('user', $ids);
+
+ foreach ( $ids as $id ) {
</ins><span class="cx"> $meta = get_metadata('user', $id);
</span><del>- foreach ( $meta as $key => $metavalues )
- foreach ( $metavalues as $value )
</del><ins>+ foreach ( $meta as $key => $metavalues ) {
+ foreach ( $metavalues as $value ) {
</ins><span class="cx"> $objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
</span><del>-
- return $objects;
</del><ins>+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $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;
-
</del><span class="cx"> return $objects;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1095,7 +1082,6 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> foreach ( $metavalues as $meta ) {
</span><del>- $value = maybe_unserialize($meta->meta_value);
</del><span class="cx"> // Keys used as object vars cannot have dashes.
</span><span class="cx"> $key = str_replace('-', '', $meta->meta_key);
</span><span class="cx"> $user->{$key} = $value;
</span></span></pre>
</div>
</div>
</body>
</html>