<!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>[17013] trunk: Make WP_User_Query return regular objects by default.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17013">17013</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-17 00:38:15 +0000 (Fri, 17 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make WP_User_Query return regular objects by default. Fixes <a href="http://trac.wordpress.org/ticket/15854">#15854</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (17012 => 17013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-17 00:11:21 UTC (rev 17012)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-17 00:38:15 UTC (rev 17013)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> 'number' => $users_per_page,
</span><span class="cx"> 'offset' => ( $paged-1 ) * $users_per_page,
</span><span class="cx"> 'search' => $usersearch,
</span><del>- 'blog_id' => 0
</del><ins>+ 'blog_id' => 0,
+ 'fields' => 'all_with_meta'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $role == 'super' ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (17012 => 17013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-17 00:11:21 UTC (rev 17012)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2010-12-17 00:38:15 UTC (rev 17013)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> 'number' => $users_per_page,
</span><span class="cx"> 'offset' => ( $paged-1 ) * $users_per_page,
</span><span class="cx"> 'role' => $role,
</span><del>- 'search' => $usersearch
</del><ins>+ 'search' => $usersearch,
+ 'fields' => 'all_with_meta'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $this->is_site_users )
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17012 => 17013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-17 00:11:21 UTC (rev 17012)
+++ trunk/wp-includes/user.php 2010-12-17 00:38:15 UTC (rev 17013)
</span><span class="lines">@@ -414,6 +414,8 @@
</span><span class="cx"> foreach ( $qv['fields'] as $field )
</span><span class="cx"> $this->query_fields[] = $wpdb->users . '.' . esc_sql( $field );
</span><span class="cx"> $this->query_fields = implode( ',', $this->query_fields );
</span><ins>+ } elseif ( 'all' == $qv['fields'] ) {
+ $this->query_fields = "$wpdb->users.*";
</ins><span class="cx"> } else {
</span><span class="cx"> $this->query_fields = "$wpdb->users.ID";
</span><span class="cx"> }
</span><span class="lines">@@ -522,7 +524,7 @@
</span><span class="cx"> function query() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( is_array( $this->query_vars['fields'] ) ) {
</del><ins>+ if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
</ins><span class="cx"> $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
</span><span class="cx"> } else {
</span><span class="cx"> $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
</span><span class="lines">@@ -534,8 +536,8 @@
</span><span class="cx"> if ( $this->query_vars['count_total'] )
</span><span class="cx"> $this->total_users = $wpdb->get_var("SELECT COUNT($wpdb->users.ID) $this->query_from $this->query_where $this->query_orderby $this->query_limit");
</span><span class="cx">
</span><del>- if ( 'all' == $this->query_vars['fields'] ) {
- cache_users($this->results);
</del><ins>+ if ( 'all_with_meta' == $this->query_vars['fields'] ) {
+ cache_users( $this->results );
</ins><span class="cx">
</span><span class="cx"> $r = array();
</span><span class="cx"> foreach ( $this->results as $userid )
</span></span></pre>
</div>
</div>
</body>
</html>