<!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>[25248] trunk: Introduce `author__in` and `author__not_in` query vars.</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/25248">25248</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-04 21:32:11 +0000 (Wed, 04 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce `author__in` and `author__not_in` query vars. Fixes issue with multiple author exclusion when comma-separated string is passed for `author`. Adds a bunch of missing unit tests.
Props pollett for initial patch.
Fixes <a href="http://core.trac.wordpress.org/ticket/16854">#16854</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (25247 => 25248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-04 21:27:49 UTC (rev 25247)
+++ trunk/src/wp-includes/query.php 2013-09-04 21:32:11 UTC (rev 25248)
</span><span class="lines">@@ -1396,6 +1396,7 @@
</span><span class="cx"> , 'tag'
</span><span class="cx"> , 'cat'
</span><span class="cx"> , 'tag_id'
</span><ins>+ , 'author'
</ins><span class="cx"> , 'author_name'
</span><span class="cx"> , 'feed'
</span><span class="cx"> , 'tb'
</span><span class="lines">@@ -1416,7 +1417,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in',
</span><del>- 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in' );
</del><ins>+ 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in',
+ 'author__in', 'author__not_in' );
</ins><span class="cx">
</span><span class="cx"> foreach ( $array_keys as $key ) {
</span><span class="cx"> if ( !isset($array[$key]) )
</span><span class="lines">@@ -1457,6 +1459,7 @@
</span><span class="cx"> $qv['m'] = preg_replace( '|[^0-9]|', '', $qv['m'] );
</span><span class="cx"> $qv['paged'] = absint($qv['paged']);
</span><span class="cx"> $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
</span><ins>+ $qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
</ins><span class="cx"> $qv['pagename'] = trim( $qv['pagename'] );
</span><span class="cx"> $qv['name'] = trim( $qv['name'] );
</span><span class="cx"> if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
</span><span class="lines">@@ -1769,9 +1772,9 @@
</span><span class="cx"> $q['category__in'][] = absint( reset( $q['category__and'] ) );
</span><span class="cx"> unset( $q['category__and'] );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty( $q['category__in'] ) ) {
</span><del>- $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
</del><ins>+ $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
</ins><span class="cx"> $tax_query[] = array(
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__in'],
</span><span class="lines">@@ -2333,28 +2336,24 @@
</span><span class="cx">
</span><span class="cx"> // Author/user stuff
</span><span class="cx">
</span><del>- if ( empty($q['author']) || ($q['author'] == '0') ) {
- $whichauthor = '';
- } else {
- $q['author'] = (string)urldecode($q['author']);
- $q['author'] = addslashes_gpc($q['author']);
- if ( strpos($q['author'], '-') !== false ) {
- $eq = '!=';
- $andor = 'AND';
- $q['author'] = explode('-', $q['author']);
- $q['author'] = (string)absint($q['author'][1]);
- } else {
- $eq = '=';
- $andor = 'OR';
</del><ins>+ if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
+ $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
+ $authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
+ foreach ( $authors as $author ) {
+ $key = $author > 0 ? 'author__in' : 'author__not_in';
+ $q[$key][] = abs( $author );
</ins><span class="cx"> }
</span><del>- $author_array = preg_split('/[,\s]+/', $q['author']);
- $_author_array = array();
- foreach ( $author_array as $key => $_author )
- $_author_array[] = "$wpdb->posts.post_author " . $eq . ' ' . absint($_author);
- $whichauthor .= ' AND (' . implode(" $andor ", $_author_array) . ')';
- unset($author_array, $_author_array);
</del><ins>+ $q['author'] = implode( ',', $authors );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( ! empty( $q['author__not_in'] ) ) {
+ $author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
+ $where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
+ } elseif ( ! empty( $q['author__in'] ) ) {
+ $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
+ $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
+ }
+
</ins><span class="cx"> // Author stuff for nice URLs
</span><span class="cx">
</span><span class="cx"> if ( '' != $q['author_name'] ) {
</span><span class="lines">@@ -2457,7 +2456,7 @@
</span><span class="cx"> $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
</span><span class="cx"> if ( empty( $in_search_post_types ) )
</span><span class="cx"> $where .= ' AND 1=0 ';
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
</span><span class="cx"> } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
</span><span class="cx"> $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/results.php (25247 => 25248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/results.php 2013-09-04 21:27:49 UTC (rev 25247)
+++ trunk/tests/phpunit/tests/query/results.php 2013-09-04 21:32:11 UTC (rev 25248)
</span><span class="lines">@@ -388,4 +388,102 @@
</span><span class="cx"> $this->assertNotEmpty( $posts2 );
</span><span class="cx"> $this->assertNotRegExp( '#AND 1=0#', $this->q->request );
</span><span class="cx"> }
</span><ins>+
+ function test_query_author_vars() {
+ $author_1 = $this->factory->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_1 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
+
+ $author_2 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_2 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
+
+ $author_3 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_3 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
+
+ $author_4 = $this->factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+ $post_4 = $this->factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
+
+ $posts = $this->q->query( array(
+ 'author' => '',
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_2, $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => 0,
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_2, $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => '0',
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_2, $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => $author_1,
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => "$author_1",
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => "{$author_1},{$author_2}",
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_2 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => "-{$author_1},{$author_2}",
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_2, $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => "{$author_1},-{$author_2}",
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author' => "-{$author_1},-{$author_2}",
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author__in' => array( $author_1, $author_2 ),
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1, $author_2 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author__not_in' => array( $author_1, $author_2 ),
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_3, $author_4 ), $author_ids );
+
+ $posts = $this->q->query( array(
+ 'author_name' => 'admin1',
+ 'post__in' => array( $post_1, $post_2, $post_3, $post_4 )
+ ) );
+ $author_ids = array_unique( wp_list_pluck( $posts, 'post_author' ) );
+ $this->assertEqualSets( array( $author_1 ), $author_ids );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>