<!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" />
<title>[25392] trunk: * Add `isset()` checks all over `WP_User_Query::prepare_query()` and `WP_User_Query::query()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25392">25392</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 06:24:09 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Add `isset()` checks all over `WP_User_Query::prepare_query()` and `WP_User_Query::query()`. When a `WP_User_Query` instance is constructed without passing args, no query vars are filled in, thus `$qv` doesn't contain most of the expected indices.
* Suppress an undefined index notice in `tests/user/query.php`
Fixes <a href="http://core.trac.wordpress.org/ticket/25292">#25292</a>.
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/user.php (25391 => 25392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2013-09-12 06:06:07 UTC (rev 25391)
+++ trunk/src/wp-includes/user.php 2013-09-12 06:24:09 UTC (rev 25392)
</span><span class="lines">@@ -409,39 +409,44 @@
</span><span class="cx"> $this->query_fields = "$wpdb->users.ID";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $qv['count_total'] )
</del><ins>+ if ( isset( $qv['count_total'] ) && $qv['count_total'] )
</ins><span class="cx"> $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
</span><span class="cx">
</span><span class="cx"> $this->query_from = "FROM $wpdb->users";
</span><span class="cx"> $this->query_where = "WHERE 1=1";
</span><span class="cx">
</span><span class="cx"> // sorting
</span><del>- if ( in_array( $qv['orderby'], array('nicename', 'email', 'url', 'registered') ) ) {
- $orderby = 'user_' . $qv['orderby'];
- } elseif ( in_array( $qv['orderby'], array('user_nicename', 'user_email', 'user_url', 'user_registered') ) ) {
- $orderby = $qv['orderby'];
- } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) {
- $orderby = 'display_name';
- } elseif ( 'post_count' == $qv['orderby'] ) {
- // todo: avoid the JOIN
- $where = get_posts_by_author_sql('post');
- $this->query_from .= " LEFT OUTER JOIN (
- SELECT post_author, COUNT(*) as post_count
- FROM $wpdb->posts
- $where
- GROUP BY post_author
- ) p ON ({$wpdb->users}.ID = p.post_author)
- ";
- $orderby = 'post_count';
- } elseif ( 'ID' == $qv['orderby'] || 'id' == $qv['orderby'] ) {
- $orderby = 'ID';
- } elseif ( 'meta_value' == $qv['orderby'] ) {
- $orderby = "$wpdb->usermeta.meta_value";
- } else {
- $orderby = 'user_login';
</del><ins>+ if ( isset( $qv['orderby'] ) ) {
+ if ( in_array( $qv['orderby'], array('nicename', 'email', 'url', 'registered') ) ) {
+ $orderby = 'user_' . $qv['orderby'];
+ } elseif ( in_array( $qv['orderby'], array('user_nicename', 'user_email', 'user_url', 'user_registered') ) ) {
+ $orderby = $qv['orderby'];
+ } elseif ( 'name' == $qv['orderby'] || 'display_name' == $qv['orderby'] ) {
+ $orderby = 'display_name';
+ } elseif ( 'post_count' == $qv['orderby'] ) {
+ // todo: avoid the JOIN
+ $where = get_posts_by_author_sql('post');
+ $this->query_from .= " LEFT OUTER JOIN (
+ SELECT post_author, COUNT(*) as post_count
+ FROM $wpdb->posts
+ $where
+ GROUP BY post_author
+ ) p ON ({$wpdb->users}.ID = p.post_author)
+ ";
+ $orderby = 'post_count';
+ } elseif ( 'ID' == $qv['orderby'] || 'id' == $qv['orderby'] ) {
+ $orderby = 'ID';
+ } elseif ( 'meta_value' == $qv['orderby'] ) {
+ $orderby = "$wpdb->usermeta.meta_value";
+ } else {
+ $orderby = 'user_login';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $qv['order'] = strtoupper( $qv['order'] );
</del><ins>+ if ( empty( $orderby ) )
+ $orderby = 'user_login';
+
+ $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
</ins><span class="cx"> if ( 'ASC' == $qv['order'] )
</span><span class="cx"> $order = 'ASC';
</span><span class="cx"> else
</span><span class="lines">@@ -449,14 +454,17 @@
</span><span class="cx"> $this->query_orderby = "ORDER BY $orderby $order";
</span><span class="cx">
</span><span class="cx"> // limit
</span><del>- if ( $qv['number'] ) {
</del><ins>+ if ( isset( $qv['number'] ) && $qv['number'] ) {
</ins><span class="cx"> if ( $qv['offset'] )
</span><span class="cx"> $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
</span><span class="cx"> else
</span><span class="cx"> $this->query_limit = $wpdb->prepare("LIMIT %d", $qv['number']);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $search = trim( $qv['search'] );
</del><ins>+ $search = '';
+ if ( isset( $qv['search'] ) )
+ $search = trim( $qv['search'] );
+
</ins><span class="cx"> if ( $search ) {
</span><span class="cx"> $leading_wild = ( ltrim($search, '*') != $search );
</span><span class="cx"> $trailing_wild = ( rtrim($search, '*') != $search );
</span><span class="lines">@@ -490,16 +498,20 @@
</span><span class="cx"> $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $blog_id = absint( $qv['blog_id'] );
</del><ins>+ $blog_id = 0;
+ if ( isset( $qv['blog_id'] ) )
+ $blog_id = absint( $qv['blog_id'] );
</ins><span class="cx">
</span><del>- if ( 'authors' == $qv['who'] && $blog_id ) {
</del><ins>+ if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
</ins><span class="cx"> $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
</span><span class="cx"> $qv['meta_value'] = 0;
</span><span class="cx"> $qv['meta_compare'] = '!=';
</span><span class="cx"> $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $role = trim( $qv['role'] );
</del><ins>+ $role = '';
+ if ( isset( $qv['role'] ) )
+ $role = trim( $qv['role'] );
</ins><span class="cx">
</span><span class="cx"> if ( $blog_id && ( $role || is_multisite() ) ) {
</span><span class="cx"> $cap_meta_query = array();
</span><span class="lines">@@ -525,10 +537,10 @@
</span><span class="cx"> $this->query_fields = 'DISTINCT ' . $this->query_fields;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $qv['include'] ) ) {
</del><ins>+ if ( ! empty( $qv['include'] ) ) {
</ins><span class="cx"> $ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
</span><span class="cx"> $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
</span><del>- } elseif ( !empty($qv['exclude']) ) {
</del><ins>+ } elseif ( ! empty( $qv['exclude'] ) ) {
</ins><span class="cx"> $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
</span><span class="cx"> $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
</span><span class="cx"> }
</span><span class="lines">@@ -553,7 +565,7 @@
</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="cx"> }
</span><span class="cx">
</span><del>- if ( $qv['count_total'] )
</del><ins>+ if ( isset( $qv['count_total'] ) && $qv['count_total'] )
</ins><span class="cx"> $this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
</span><span class="cx">
</span><span class="cx"> if ( !$this->results )
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/user/query.php (25391 => 25392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/user/query.php 2013-09-12 06:06:07 UTC (rev 25391)
+++ trunk/tests/phpunit/tests/user/query.php 2013-09-12 06:24:09 UTC (rev 25392)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> $users = new WP_User_Query();
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( '', $users->get( 'fields' ) );
</span><del>- $this->assertEquals( '', $users->query_vars['fields'] );
</del><ins>+ $this->assertEquals( '', @$users->query_vars['fields'] );
</ins><span class="cx">
</span><span class="cx"> $users->set( 'fields', 'all' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>