<!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>[29934] trunk: Support date_query by user_registered 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/29934">29934</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/29934","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>2014-10-17 01:36:36 +0000 (Fri, 17 Oct 2014)</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'>Support date_query by user_registered in WP_User_Query.
Props ChriCo, nacin.
Fixes <a href="https://core.trac.wordpress.org/ticket/27283">#27283</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdatephp">trunk/src/wp-includes/date.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsuserdateQueryphp">trunk/tests/phpunit/tests/user/dateQuery.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdatephp"></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/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/date.php 2014-10-17 01:19:03 UTC (rev 29933)
+++ trunk/src/wp-includes/date.php 2014-10-17 01:36:36 UTC (rev 29934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +451,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $valid_columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date', 'post_date_gmt', 'post_modified',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_modified_gmt', 'comment_date', 'comment_date_gmt'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_modified_gmt', 'comment_date', 'comment_date_gmt',
+ 'user_registered',
</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"> // Attempt to detect a table prefix.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +464,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $valid_columns An array of valid date query columns. Defaults
</span><span class="cx" style="display: block; padding: 0 10px"> * are 'post_date', 'post_date_gmt', 'post_modified',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'post_modified_gmt', 'comment_date', 'comment_date_gmt'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 'post_modified_gmt', 'comment_date', 'comment_date_gmt',
+ * 'user_registered'
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $column = 'post_date';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -480,6 +482,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_date_gmt',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->users => array(
+ 'user_registered',
+ ),
</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"> // If it's a known column name, add the appropriate table prefix.
</span></span></pre></div>
<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 2014-10-17 01:19:03 UTC (rev 29933)
+++ trunk/src/wp-includes/user.php 2014-10-17 01:36:36 UTC (rev 29934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,6 +742,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
</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">+ // Date queries are allowed for the user_registered field.
+ if ( ! empty( $qv['date_query'] ) && is_array( $qv['date_query'] ) ) {
+ $date_query = new WP_Date_Query( $qv['date_query'], 'user_registered' );
+ $this->query_where .= $date_query->get_sql();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the WP_User_Query has been parsed, and before
</span><span class="cx" style="display: block; padding: 0 10px"> * the query is executed.
</span></span></pre></div>
<a id="trunktestsphpunittestsuserdateQueryphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/user/dateQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/dateQuery.php (rev 0)
+++ trunk/tests/phpunit/tests/user/dateQuery.php 2014-10-17 01:36:36 UTC (rev 29934)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,58 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group user
+ * @group datequery
+ */
+class Tests_User_DateQuery extends WP_UnitTestCase {
+ /**
+ * @ticket 27283
+ */
+ public function test_user_registered() {
+ $u1 = $this->factory->user->create( array(
+ 'user_registered' => '2012-02-14 05:05:05',
+ ) );
+ $u2 = $this->factory->user->create( array(
+ 'user_registered' => '2013-02-14 05:05:05',
+ ) );
+
+ $uq = new WP_User_Query( array(
+ 'date_query' => array(
+ array(
+ 'year' => 2012,
+ ),
+ ),
+ ) );
+
+ $this->assertEqualSets( array( $u1 ), wp_list_pluck( $uq->results, 'ID' ) );
+ }
+
+ /**
+ * @ticket 27283
+ */
+ public function test_user_registered_relation_or() {
+ $u1 = $this->factory->user->create( array(
+ 'user_registered' => '2012-02-14 05:05:05',
+ ) );
+ $u2 = $this->factory->user->create( array(
+ 'user_registered' => '2013-02-14 05:05:05',
+ ) );
+ $u3 = $this->factory->user->create( array(
+ 'user_registered' => '2014-02-14 05:05:05',
+ ) );
+
+ $uq = new WP_User_Query( array(
+ 'date_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'year' => 2013,
+ ),
+ array(
+ 'before' => '2012-03-01 00:00:00',
+ ),
+ ),
+ ) );
+
+ $this->assertEqualSets( array( $u1, $u2 ), wp_list_pluck( $uq->results, 'ID' ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>