Changeset 2958

Timestamp:

04/28/2010 06:35:08 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2222 props boonebgorges

Location:

branches/1.2

Files:

• bp-groups.php (modified) (2 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)

branches/1.2/bp-groups.php

@@ -2207 +2207 @@
                 return false;
 
+        /* Remove request to join */
+        if ( $member->check_for_membership_request( $user_id, $group_id ) )
+                $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 );
@@ -2381 +2385 @@
         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 */

branches/1.2/bp-groups/bp-groups-classes.php

@@ -910 +910 @@
         }
 
+        function delete_request( $user_id, $group_id ) {
+                global $wpdb, $bp;
+
+                if ( !$user_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 check_is_admin( $user_id, $group_id ) {
                 global $wpdb, $bp;