Ticket #2222: prevent_duplicate_memberships.diff

bp-groups.php

@@ -136 +136 @@
                         bp_core_new_subnav_item( array( 'name' => sprintf( __( 'Members (%s)', 'buddypress' ), number_format( $bp->groups->current_group->total_member_count ) ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'members'  ) );
 
                         if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
-                                if ( function_exists('friends_install') )
+                                if ( bp_is_active( 'friends' ) )
                                         bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
                         }
                 }
@@ -2065 +2065 @@
         if ( !$member->save() )
                 return false;
 
+        BP_Groups_Member::delete_request( $user_id, $group_id );
+
         /* Modify group meta */
         groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
         groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
@@ -2240 +2242 @@
         if ( !$membership->save() )
                 return false;
 
+        /* Check if the user has an outstanding invite, if so delete it. */
+        if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) )
+                groups_delete_invite( $membership->user_id, $membership->group_id );
+
         /* Modify group member count */
         groups_update_groupmeta( $membership->group_id, 'total_member_count', (int) groups_get_groupmeta( $membership->group_id, 'total_member_count') + 1 );
 

bp-groups/bp-groups-classes.php

@@ -832 +832 @@
 
                 return $wpdb->query( $wpdb->prepare( "SELECT id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND is_banned = 0 AND inviter_id = 0", $user_id, $group_id ) );
         }
+        
+        function delete_request( $user_id, $group_id ) {
+                global $wpdb, $bp;
 
+                if ( !$user_id || !$group_id )
+                        return false;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
+        }
+
         function get_random_groups( $user_id, $total_groups = 5 ) {
                 global $wpdb, $bp;