Changeset 7237

Timestamp:

06/24/2013 06:59:22 PM (11 years ago)

Author:

boonebgorges

Message:

Adds is_confirmed param to BP_Group_Member_Query, defaulting to true

This additional parameter ensures that BP_Group_Member_Query distinguishes
between confirmed and unconfirmed members when pulling up lists of group
members.

Fixes #5072

Props Mike_Cowobo

Location:

trunk

Files:

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

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

@@ -988 +988 @@
         // these defaults).
         $this->query_vars = wp_parse_args( $this->query_vars, array(
-            'group_id'   => 0,
-            'group_role' => array( 'member' ),
+            'group_id'     => 0,
+            'group_role'   => array( 'member' ),
+            'is_confirmed' => true,
         ) );
 
@@ -1027 +1028 @@
         /** WHERE clauses *****************************************************/
 
+        // Group id
         $sql['where'][] = $wpdb->prepare( "group_id = %d", $this->query_vars['group_id'] );
+
+        // is_confirmed
+        $is_confirmed = ! empty( $this->query_vars['is_confirmed'] ) ? 1 : 0;
+        $sql['where'][] = $wpdb->prepare( "is_confirmed = %d", $is_confirmed );
 
         // Role information is stored as follows: admins have

trunk/tests/includes/testcase.php

@@ -227 +227 @@
         $r = wp_parse_args( $args, array(
             'date_modified' => bp_core_current_time(),
+            'is_confirmed' => 1,
         ) );
 
@@ -236 +237 @@
         $new_member->user_title    = '';
         $new_member->date_modified = $r['date_modified'];
-        $new_member->is_confirmed  = 1;
+        $new_member->is_confirmed  = $r['is_confirmed'];
 
         $new_member->save();

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

@@ -299 +299 @@
     }
 
+    public function test_confirmed_members() {
+        $g = $this->factory->group->create();
+        $u1 = $this->create_user();
+        $u2 = $this->create_user();
+
+        $this->add_user_to_group( $u1, $g, array(
+            'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
+            'is_confirmed' => 0,
+        ) );
+
+        $this->add_user_to_group( $u2, $g, array(
+            'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
+            'is_confirmed' => 1,
+        ) );
+
+        $query_members = new BP_Group_Member_Query( array(
+            'group_id' => $g,
+        ) );
+
+        $ids = wp_parse_id_list( array_keys( $query_members->results ) );
+        $this->assertEquals( array( $u2 ), $ids );
+    }
+
 }