<!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>[32683] trunk: Introduce `'has_published_posts'` parameter for `WP_User_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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32683">32683</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32683","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-02 13:29:44 +0000 (Tue, 02 Jun 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Introduce `'has_published_posts'` parameter for `WP_User_Query`.
This allows user query results to be limited to those users who have published
posts in at least one of the specified post types.
Props joehoyle, boonebgorges.
Fixes <a href="https://core.trac.wordpress.org/ticket/32250">#32250</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2015-06-02 05:50:33 UTC (rev 32682)
+++ trunk/src/wp-includes/user.php 2015-06-02 13:29:44 UTC (rev 32683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,6 +569,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'url', 'registered'. Use 'all' for all fields and 'all_with_meta' to
</span><span class="cx" style="display: block; padding: 0 10px"> * include meta fields. Default 'all'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $who Type of users to query. Accepts 'authors'. Default empty (all users).
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type bool|array $has_published_posts Pass an array of post types to filter results to users who have
+ * published posts in those post types. `true` is an alias for all
+ * public post types.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_query( $query = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +595,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'count_total' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'who' => ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'who' => '',
+ 'has_published_posts' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,6 +655,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $qv['has_published_posts'] && $blog_id ) {
+ if ( true === $qv['has_published_posts'] ) {
+ $post_types = get_post_types( array( 'public' => true ) );
+ } else {
+ $post_types = (array) $qv['has_published_posts'];
+ }
+
+ foreach ( $post_types as &$post_type ) {
+ $post_type = $wpdb->prepare( '%s', $post_type );
+ }
+
+ $posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
+ $this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Meta query.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_query = new WP_Meta_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_query->parse_query_vars( $qv );
</span></span></pre></div>
<a id="trunktestsphpunittestsuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2015-06-02 05:50:33 UTC (rev 32682)
+++ trunk/tests/phpunit/tests/user/query.php 2015-06-02 13:29:44 UTC (rev 32683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,4 +686,107 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $users[1], $found );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( $users[2], $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 32250
+ */
+ public function test_has_published_posts_with_value_true_should_show_authors_of_posts_in_public_post_types() {
+ register_post_type( 'wptests_pt_public', array( 'public' => true ) );
+ register_post_type( 'wptests_pt_private', array( 'public' => false ) );
+
+ $users = $this->factory->user->create_many( 3 );
+
+ $this->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+
+ $q = new WP_User_Query( array(
+ 'has_published_posts' => true,
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+ $expected = array( $users[0] );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ /**
+ * @ticket 32250
+ */
+ public function test_has_published_posts_should_obey_post_types() {
+ register_post_type( 'wptests_pt_public', array( 'public' => true ) );
+ register_post_type( 'wptests_pt_private', array( 'public' => false ) );
+
+ $users = $this->factory->user->create_many( 3 );
+
+ $this->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+ $this->factory->post->create( array( 'post_author' => $users[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
+
+ $q = new WP_User_Query( array(
+ 'has_published_posts' => array( 'wptests_pt_private', 'post' ),
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+ $expected = array( $users[1], $users[2] );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ /**
+ * @ticket 32250
+ */
+ public function test_has_published_posts_should_ignore_non_published_posts() {
+ register_post_type( 'wptests_pt_public', array( 'public' => true ) );
+ register_post_type( 'wptests_pt_private', array( 'public' => false ) );
+
+ $users = $this->factory->user->create_many( 3 );
+
+ $this->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
+ $this->factory->post->create( array( 'post_author' => $users[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
+
+ $q = new WP_User_Query( array(
+ 'has_published_posts' => array( 'wptests_pt_public', 'wptests_pt_private', 'post' ),
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+ $expected = array( $users[2] );
+
+ $this->assertEqualSets( $expected, $found );
+ }
+
+ /**
+ * @ticket 32250
+ */
+ public function test_has_published_posts_should_respect_blog_id() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+ }
+
+ $users = $this->factory->user->create_many( 3 );
+ $blogs = $this->factory->blog->create_many( 2 );
+
+ add_user_to_blog( $blogs[0], $users[0], 'author' );
+ add_user_to_blog( $blogs[0], $users[1], 'author' );
+ add_user_to_blog( $blogs[1], $users[0], 'author' );
+ add_user_to_blog( $blogs[1], $users[1], 'author' );
+
+ switch_to_blog( $blogs[0] );
+ $this->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
+ restore_current_blog();
+
+ switch_to_blog( $blogs[1] );
+ $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
+ restore_current_blog();
+
+ $q = new WP_User_Query( array(
+ 'has_published_posts' => array( 'post' ),
+ 'blog_id' => $blogs[1],
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+ $expected = array( $users[1] );
+
+ $this->assertEqualSets( $expected, $found );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>