Changeset 7143

Timestamp:

06/04/2013 03:04:18 AM (12 years ago)

Author:

boonebgorges

Message:

In BP_Group_Member_Query, when no members are found of a type, ensure the query fails to return results

Location:

trunk

Files:

• bp-groups/bp-groups-classes.php (modified) (1 diff)
• tests/testcases/groups/class-bp-group-member-query.php (modified) (1 diff)

trunk/bp-groups/bp-groups-classes.php

@@ -994 +994 @@
 
         $group_member_ids = $this->get_group_member_ids();
+
+        // If the group member query returned no users, bail with an
+        // array that will guarantee no matches for BP_User_Query
+        if ( empty( $group_member_ids ) ) {
+            return array( 0 );
+        }
 
         if ( ! empty( $include ) ) {

trunk/tests/testcases/groups/class-bp-group-member-query.php

@@ -223 +223 @@
     }
 
+    public function test_group_has_no_members() {
+        $g = $this->factory->group->create();
+        $u1 = $this->create_user();
+
+        $query_members = new BP_Group_Member_Query( array(
+            'group_id' => $g,
+            'group_role' => array( 'member', 'mod', 'admin' ),
+        ) );
+
+        $ids = wp_parse_id_list( array_keys( $query_members->results ) );
+        $this->assertEquals( array(), $ids );
+    }
+
+    public function test_group_has_no_members_of_role_mod() {
+        $g = $this->factory->group->create();
+        $u1 = $this->create_user();
+
+        $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
+
+        $query_members = new BP_Group_Member_Query( array(
+            'group_id' => $g,
+            'group_role' => array( 'mod' ),
+        ) );
+
+        $ids = wp_parse_id_list( array_keys( $query_members->results ) );
+        $this->assertEquals( array(), $ids );
+    }
 
 }