Changeset 2582

Timestamp:

02/04/2010 11:51:04 AM (17 years ago)

Author:

apeatling

Message:

Fixes #1801

Location:

trunk

Files:

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

trunk/bp-groups.php

@@ -1624 +1624 @@
         /* Don't let single admins leave the group. */
         if ( count( groups_get_group_admins( $group_id ) ) < 2 ) {
-                if ( groups_is_user_admin( $user_id, $group_id ) )
+                if ( groups_is_user_admin( $user_id, $group_id ) ) {
+                        bp_core_add_message( __( 'As the only Admin, you cannot leave the group.', 'buddypress' ), 'error' );
                         return false;
-        }
-
-        // This is exactly the same as deleting and invite, just is_confirmed = 1 NOT 0.
-        if ( !groups_uninvite_user( $user_id, $group_id, true ) )
+                }
+        }
+
+        // This is exactly the same as deleting an invite, just is_confirmed = 1 NOT 0.
+        if ( !groups_uninvite_user( $user_id, $group_id ) )
                 return false;
 
@@ -1636 +1638 @@
         /* Modify group member count */
         groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 );
+
+        /* Modify user's group memberhip count */
+        update_usermeta( $user_id, 'total_group_count', (int) get_usermeta( $user_id, 'total_group_count') - 1 );
+
+        bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
 
         return true;

trunk/bp-groups/bp-groups-classes.php

@@ -759 +759 @@
         /* Static Functions */
 
-        function delete( $user_id, $group_id, $check_empty = true ) {
-                global $wpdb, $bp;
-
-                $delete_result = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
-
-                return $delete_result;
+        function delete( $user_id, $group_id ) {
+                global $wpdb, $bp;
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
         }