Ticket #37641: 37641.diff

src/wp-includes/class-wp-user-query.php

@@ -117 +117 @@
                         'has_published_posts' => null,
                 );
 
+                if ( is_multisite() ) {
+                        $defaults['spam'] = null;
+                        $defaults['deleted'] = null;
+                }
+
                 return wp_parse_args( $args, $defaults );
         }
 
@@ -131 +136 @@
          * @since 4.4.0 Added 'paged', 'role__in', and 'role__not_in' parameters. The 'role' parameter was updated to
          *              permit an array or comma-separated list of values. The 'number' parameter was updated to support
          *              querying for all users with using -1.
+         * @since 4.7.0 Added 'spam' and 'deleted' parameters for multisite setups.
          *
          * @access public
          *
@@ -195 +201 @@
          *     @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.
+         *     @type int          $spam                Limit results to spam users. Only available on multisite. Accepts
+         *                                             '1' or '0'. Default empty.
+         *     @type int          $deleted             Limit results to deleted users. Only available on multisite. Accepts
+         *                                             '1' or '0'. Default empty.
          * }
          */
         public function prepare_query( $query = array() ) {
@@ -511 +521 @@
                         $this->query_where .= $date_query->get_sql();
                 }
 
+                // On multisite two additional column values may be queried.
+                if ( is_multisite() ) {
+                        if ( is_numeric( $qv['spam'] ) ) {
+                                $spam = absint( $qv['spam'] );
+                                $this->query_where .= $wpdb->prepare( " AND $wpdb->users.spam = %d", $spam );
+                        }
+
+                        if ( is_numeric( $qv['deleted'] ) ) {
+                                $deleted = absint( $qv['deleted'] );
+                                $this->query_where .= $wpdb->prepare( " AND $wpdb->users.deleted = %d", $deleted );
+                        }
+                }
+
                 /**
                  * Fires after the WP_User_Query has been parsed, and before
                  * the query is executed.

tests/phpunit/tests/user/query.php

@@ -1229 +1229 @@
                 $this->assertSame( $r1, $r2 );
                 $this->assertSame( $r1, $r3 );
         }
+
+        /**
+         * @ticket 37641
+         */
+        public function test_get_users_spam() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+                }
+
+                $not_spam_users = self::$author_ids;
+                $spam_user = array_shift( $not_spam_users );
+
+                update_user_status( $spam_user, 'spam', '1' );
+
+                $q = new WP_User_Query( array(
+                        'fields' => '',
+                        'include' => self::$author_ids,
+                        'spam' => '1',
+                ) );
+                $ids = $q->get_results();
+
+                $this->assertEqualSets( array( $spam_user ), $ids );
+
+                update_user_status( $spam_user, 'spam', '0' );
+        }
+
+        /**
+         * @ticket 37641
+         */
+        public function test_get_users_not_spam() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+                }
+
+                $not_spam_users = self::$author_ids;
+                $spam_user = array_shift( $not_spam_users );
+
+                update_user_status( $spam_user, 'spam', '1' );
+
+                $q = new WP_User_Query( array(
+                        'fields' => '',
+                        'include' => self::$author_ids,
+                        'spam' => '0',
+                ) );
+                $ids = $q->get_results();
+
+                $this->assertEqualSets( $not_spam_users, $ids );
+
+                update_user_status( $spam_user, 'spam', '0' );
+        }
+
+        /**
+         * @ticket 37641
+         */
+        public function test_get_users_deleted() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+                }
+
+                $not_deleted_users = self::$author_ids;
+                $deleted_user = array_shift( $not_deleted_users );
+
+                update_user_status( $deleted_user, 'deleted', '1' );
+
+                $q = new WP_User_Query( array(
+                        'fields' => '',
+                        'include' => self::$author_ids,
+                        'deleted' => '1',
+                ) );
+                $ids = $q->get_results();
+
+                $this->assertEqualSets( array( $deleted_user ), $ids );
+
+                update_user_status( $deleted_user, 'deleted', '0' );
+        }
+
+        /**
+         * @ticket 37641
+         */
+        public function test_get_users_not_deleted() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
+                }
+
+                $not_deleted_users = self::$author_ids;
+                $deleted_user = array_shift( $not_deleted_users );
+
+                update_user_status( $deleted_user, 'deleted', '1' );
+
+                $q = new WP_User_Query( array(
+                        'fields' => '',
+                        'include' => self::$author_ids,
+                        'deleted' => '0',
+                ) );
+                $ids = $q->get_results();
+
+                $this->assertEqualSets( $not_deleted_users, $ids );
+
+                update_user_status( $deleted_user, 'deleted', '0' );
+        }
 }