Changeset 3257

Timestamp:

09/12/2010 02:29:29 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fix remove from group functionality.

Location:

branches/1.2

Files:

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

branches/1.2/bp-groups.php

@@ -869 +869 @@
 
                         // Remove a user.
-                        if ( !groups_remove_member( $bp->groups->current_group->id, $user_id ) )
+                        if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) )
                                 bp_core_add_message( __( 'There was an error removing that user from the group, please try again', 'buddypress' ), 'error' );
                         else
@@ -2405 +2405 @@
         do_action( 'groups_remove_member', $group_id, $user_id );
 
-        if ( !$member->remove( $user_id, $group_id ) )
-                return false;
+        return $member->remove();
 }
 

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

@@ -777 +777 @@
 
         function accept_invite() {
-                $this->inviter_id = 0;
-                $this->is_confirmed = 1;
+                $this->inviter_id    = 0;
+                $this->is_confirmed  = 1;
                 $this->date_modified = bp_core_current_time();
+
+                update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
         }
 
@@ -785 +787 @@
                 $this->is_confirmed = 1;
                 $this->date_modified = bp_core_current_time();
-        }
-
-        function remove( $user_id, $group_id ) {
-                global $wpdb, $bp;
-
-                $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id );
+
+                update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
+        }
+
+        function remove() {
+                global $wpdb, $bp;
+
+                $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
 
                 if ( !$result = $wpdb->query( $sql ) )