Changeset 12741

Timestamp:

10/08/2020 02:31:49 PM (4 years ago)

Author:

dcavins

Message:

Change how groups_get_invites_for_user() reports total.

In groups_get_invites_for_user() use the total returned by the groups_get_groups() call. This helps avoid the edge case where invitations to groups that no longer exist are still recorded in the invitations table. In that case, groups_get_groups() will only return existent groups.

Also update groups_get_invite_count_for_user() to use this more reliable method.

Props imath.

Fixes #8297.

Location:

trunk

Files:

• src/bp-groups/bp-groups-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/groups/class-bp-groups-member.php (modified) (2 diffs)

trunk/src/bp-groups/bp-groups-functions.php

@@ -1416 +1416 @@
         'page'        => $page,
     );
-    $groups = groups_get_groups( $args );
-
-    return array( 'groups' => $groups['groups'], 'total' => groups_get_invite_count_for_user( $user_id ) );
+
+    return groups_get_groups( $args );
 }
 
@@ -1434 +1433 @@
     }
 
-    return count( groups_get_invited_to_group_ids( $user_id ) );
+    $invites = groups_get_invites_for_user( $user_id );
+    return $invites['total'];
 }
 

trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

@@ -888 +888 @@
 
         $this->assertEqualSets( array( $g1, $g2, $g3 ), wp_list_pluck( $groups['groups'], 'id' ) );
+        $this->assertEquals( 3, $groups['total'] );
     }
 
@@ -963 +964 @@
         $groups = groups_get_invites_for_user( $u2, false, false, array( $g2 ) );
         $this->assertEqualSets( array( $g1, $g3 ), wp_list_pluck( $groups['groups'], 'id' ) );
+        $this->assertEquals( 2, $groups['total'] );
     }