Changeset 9663

Timestamp:

03/30/2015 06:44:55 PM (11 years ago)

Author:

boonebgorges

Message:

Enforce no_results when getting a 0=1 result from the member type tax query.

When passing a 'member_type' to BP_User_Query and no users belong to the
member type, the WP_Tax_Query transformation will return a '0 = 1' clause to
indicate that no results were found. We should respect this result, so that no
members are returned for this kind of query.

Fixes #6334 for the 2.2 branch.

Location:

branches/2.2

Files:

• src/bp-core/bp-core-classes.php (modified) (1 diff)
• tests/phpunit/testcases/core/class-bp-user-query.php (modified) (1 diff)

branches/2.2/src/bp-core/bp-core-classes.php

@@ -436 +436 @@
                                 restore_current_blog();
 
-
-
                                 // Grab the first term_relationships clause and convert to a subquery.
                                 if ( preg_match( '/' . $wpdb->term_relationships . '\.term_taxonomy_id IN \([0-9, ]+\)/', $member_type_sql_clauses['where'], $matches ) ) {
                                         $sql['where']['member_type'] = "u.{$this->uid_name} IN ( SELECT object_id FROM $wpdb->term_relationships WHERE {$matches[0]} )";
+                                } elseif ( false !== strpos( $member_type_sql_clauses['where'], '0 = 1' ) ) {
+                                        $sql['where']['member_type'] = $this->no_results['where'];
                                 }
                         }

branches/2.2/tests/phpunit/testcases/core/class-bp-user-query.php

@@ -498 +498 @@
         }
 
+        /**
+         * @group member_types
+         * @ticket BP6334
+         */
+        public function test_should_return_no_results_when_no_users_match_the_specified_member_type() {
+                bp_register_member_type( 'foo' );
+                $users = $this->factory->user->create_many( 3 );
+
+                $q = new BP_User_Query( array(
+                        'member_type' => 'foo, baz',
+                ) );
+
+                $this->assertEmpty( $q->results );
+        }
 
         /**