Changeset 6013

Timestamp:

05/03/2012 02:34:31 PM (12 years ago)

Author:

boonebgorges

Message:

In groups_accept_invite(), if the user is already a group member, do some cleanup and return true. Prevents bugs related to duplicate uncleared membership requests/invitations. Fixes #4182

File:

• trunk/bp-groups/bp-groups-functions.php (modified) (2 diffs)

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

@@ -324 +324 @@
         $user_id = bp_loggedin_user_id();
 
-    // Check if the user has an outstanding invite, is so delete it.
+    // Check if the user has an outstanding invite. If so, delete it.
     if ( groups_check_user_has_invite( $user_id, $group_id ) )
         groups_delete_invite( $user_id, $group_id );
 
-    // Check if the user has an outstanding request, is so delete it.
+    // Check if the user has an outstanding request. If so, delete it.
     if ( groups_check_for_membership_request( $user_id, $group_id ) )
         groups_delete_membership_request( $user_id, $group_id );
@@ -606 +606 @@
 }
 
+/**
+ * Process the acceptance of a group invitation.
+ *
+ * Returns true if a user is already a member of the group.
+ *
+ * @param int $user_id
+ * @param int $group_id
+ * @return bool True when the user is a member of the group, otherwise false
+ */
 function groups_accept_invite( $user_id, $group_id ) {
     global $bp;
 
-    if ( groups_is_user_member( $user_id, $group_id ) )
-        return false;
+    // If the user is already a member (because BP at one point allowed two invitations to
+    // slip through), delete all existing invitations/requests and return true
+    if ( groups_is_user_member( $user_id, $group_id ) ) {
+        if ( groups_check_user_has_invite( $user_id, $group_id ) )
+            groups_delete_invite( $user_id, $group_id );
+
+        if ( groups_check_for_membership_request( $user_id, $group_id ) )
+            groups_delete_membership_request( $user_id, $group_id );
+
+        return true;
+    }
 
     $member = new BP_Groups_Member( $user_id, $group_id );