Ticket #27283: #27283.patch

tests/phpunit/tests/user.php

@@ -6 +6 @@
  */
 class Tests_User extends WP_UnitTestCase {
 
+        function test_get_user_by_user_registered() {
+
+                $date_query_test_args = array();
+
+                // users registered last 30 days
+                $date_query_test_args[] = array(
+                        'after' => '-30 days'
+                );
+
+                // users registered in current month
+                $date_query_test_args[] = array(
+                        'month' => gmdate( 'n' )
+                );
+
+                // users registered dayofweek between 2 and 6 AND before 01.01.2014
+                $date_query_test_args[] = array(
+                        array(
+                                'dayofweek' => array( 2, 6 ),
+                                'compare'   => 'BETWEEN',
+                        ),
+                        array(
+                                'before'    => 'January 1st, 2014'
+                        ),
+                        'relation' => 'AND'
+                );
+
+                foreach ( $date_query_test_args as $query_test_arg ) {
+
+                        $user = new WP_User_Query( array(
+                                'date_query' => $query_test_arg
+                        ) );
+
+                        // creating a date_query-object to compare the WP_User_Query-Where with the WP_Date_Query-Date
+                        $date_query = new WP_Date_Query( $query_test_arg, 'user_registered' );
+                        $this->assertEquals( $user->query_where, 'WHERE 1=1' . $date_query->get_sql() );
+
+                }
+
+        }
+
         function test_get_users_of_blog() {
                 // add one of each user role
                 $nusers = array();

src/wp-includes/user.php

@@ -455 +455 @@
                                 'meta_key' => '',
                                 'meta_value' => '',
                                 'meta_compare' => '',
+                                'date_query' => '',
                                 'include' => array(),
                                 'exclude' => array(),
                                 'search' => '',
@@ -632 +633 @@
                 } elseif ( ! empty( $qv['exclude'] ) ) {
                         $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
                         $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
+                }
+
+                // adding the date_query-Search for user_registered
+                if ( !empty( $qv[ 'date_query' ] ) ) {
+
+                        $date_query = new WP_Date_Query(
+                                $qv[ 'date_query' ],
+                                'user_registered'
+                        );
+                        $this->query_where .= $date_query->get_sql();
+
                 }
 
                 /**
@@ -1996 +2008 @@
         wp_new_user_notification( $user_id, $user_pass );
 
         return $user_id;
-}
+}
+ No newline at end of file

src/wp-includes/date.php

@@ -164 +164 @@
         public function validate_column( $column ) {
                 $valid_columns = array(
                         'post_date', 'post_date_gmt', 'post_modified',
-                        'post_modified_gmt', 'comment_date', 'comment_date_gmt'
+                        'post_modified_gmt', 'comment_date', 'comment_date_gmt',
+                    'user_registered'
                 );
                 /**
                  * Filter the list of valid date query columns.
@@ -172 +173 @@
                  * @since 3.7.0
                  *
                  * @param array $valid_columns An array of valid date query columns. Defaults are 'post_date', 'post_date_gmt',
-                 *                             'post_modified', 'post_modified_gmt', 'comment_date', 'comment_date_gmt'
+                 *                             'post_modified', 'post_modified_gmt', 'comment_date', 'comment_date_gmt', 'user_registered'
                  */
                 if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) )
                         $column = 'post_date';