<!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>[15543] trunk/wp-includes/user.php: WP_User_Query constructor improvements.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15543">15543</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-27 15:41:32 +0000 (Fri, 27 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_User_Query constructor improvements. Props filosofo. Fixes <a href="http://trac.wordpress.org/ticket/14709">#14709</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 (15542 => 15543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-08-27 01:07:21 UTC (rev 15542)
+++ trunk/wp-includes/user.php 2010-08-27 15:41:32 UTC (rev 15543)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> class WP_User_Query {
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Description}}
</del><ins>+ * List of found user ids
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> var $results;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * The total number of users for the current query
</del><ins>+ * Total number of found users for the current query
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="lines">@@ -350,31 +350,41 @@
</span><span class="cx"> */
</span><span class="cx"> var $total_users = 0;
</span><span class="cx">
</span><ins>+ // SQL pieces
</ins><span class="cx"> var $query_from;
</span><span class="cx"> var $query_where;
</span><span class="cx"> var $query_orderby;
</span><span class="cx"> var $query_limit;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Sets up the object properties.
</del><ins>+ * PHP4 constructor
+ */
+ function WP_User_Query( $query = null ) {
+ $this->__construct( $query );
+ }
+
+ /**
+ * PHP5 constructor
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $args The query variables
</span><span class="cx"> * @return WP_User_Query
</span><span class="cx"> */
</span><del>- function WP_User_Query( $query ) {
- $this->query_vars = wp_parse_args( $query, array(
- 'search' => '', 'role' => '',
- 'offset' => '', 'number' => '', 'count_total' => true,
- 'orderby' => 'login', 'order' => 'ASC',
- 'meta_key' => '', 'meta_value' => '',
- 'include' => array(), 'exclude' => array(),
- 'fields' => 'all'
- ) );
</del><ins>+ function __construct( $query = null ) {
+ if ( !empty( $query ) ) {
+ $this->query_vars = wp_parse_args( $query, array(
+ 'search' => '', 'role' => '',
+ 'offset' => '', 'number' => '', 'count_total' => true,
+ 'orderby' => 'login', 'order' => 'ASC',
+ 'meta_key' => '', 'meta_value' => '',
+ 'include' => array(), 'exclude' => array(),
+ 'fields' => 'all'
+ ) );
</ins><span class="cx">
</span><del>- $this->prepare_query();
- $this->query();
</del><ins>+ $this->prepare_query();
+ $this->query();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>