<!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>[32207] trunk: Ensure that 'who' param is respected when generating meta_query in `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/32207">32207</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/32207","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-04-20 15:15:14 +0000 (Mon, 20 Apr 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'>Ensure that 'who' param is respected when generating meta_query in `WP_User_Query`.
Since <a href="https://core.trac.wordpress.org/changeset/31669">[31669]</a>, the 'who' param had been parsed after meta_query was generated,
so that 'who' was effectively ignored.
Props imath.
Fixes <a href="https://core.trac.wordpress.org/ticket/32019">#32019</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-04-20 13:43:56 UTC (rev 32206)
+++ trunk/src/wp-includes/user.php 2015-04-20 15:15:14 UTC (rev 32207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,15 +626,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $include = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Meta query.
- $this->meta_query = new WP_Meta_Query();
- $this->meta_query->parse_query_vars( $qv );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $blog_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $qv['blog_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = absint( $qv['blog_id'] );
</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 ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
+ $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
+ $qv['meta_value'] = 0;
+ $qv['meta_compare'] = '!=';
+ $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
+ }
+
+ // Meta query.
+ $this->meta_query = new WP_Meta_Query();
+ $this->meta_query->parse_query_vars( $qv );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $role = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $qv['role'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $role = trim( $qv['role'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,13 +782,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
- $qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
- $qv['meta_value'] = 0;
- $qv['meta_compare'] = '!=';
- $qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $include ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitized earlier.
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = implode( ',', $include );
</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-04-20 13:43:56 UTC (rev 32206)
+++ trunk/tests/phpunit/tests/user/query.php 2015-04-20 15:15:14 UTC (rev 32207)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -625,4 +625,65 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'author' ), $user->roles );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'author' => true ), $user->caps );
</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 32019
+ */
+ public function test_who_authors() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+ }
+
+ $b = $this->factory->blog->create();
+ $users = $this->factory->user->create_many( 3 );
+
+ add_user_to_blog( $b, $users[0], 'subscriber' );
+ add_user_to_blog( $b, $users[1], 'author' );
+ add_user_to_blog( $b, $users[2], 'editor' );
+
+ $q = new WP_User_Query( array(
+ 'who' => 'authors',
+ 'blog_id' => $b,
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+
+ $this->assertNotContains( $users[0], $found );
+ $this->assertContains( $users[1], $found );
+ $this->assertContains( $users[2], $found );
+ }
+
+ /**
+ * @ticket 32019
+ */
+ public function test_who_authors_should_work_alongside_meta_query() {
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+ }
+
+ $b = $this->factory->blog->create();
+ $users = $this->factory->user->create_many( 3 );
+
+ add_user_to_blog( $b, $users[0], 'subscriber' );
+ add_user_to_blog( $b, $users[1], 'author' );
+ add_user_to_blog( $b, $users[2], 'editor' );
+
+ add_user_meta( $users[1], 'foo', 'bar' );
+ add_user_meta( $users[2], 'foo', 'baz' );
+
+ $q = new WP_User_Query( array(
+ 'who' => 'authors',
+ 'blog_id' => $b,
+ 'meta_query' => array(
+ 'key' => 'foo',
+ 'value' => 'bar',
+ ),
+ ) );
+
+ $found = wp_list_pluck( $q->get_results(), 'ID' );
+
+ $this->assertNotContains( $users[0], $found );
+ $this->assertContains( $users[1], $found );
+ $this->assertNotContains( $users[2], $found );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>