Ticket #5018: 5018.01.patch

bp-groups/bp-groups-cache.php

@@ -94 +94 @@
 function groups_clear_group_user_object_cache( $group_id, $user_id ) {
         wp_cache_delete( 'bp_total_groups_for_user_' . $user_id, 'bp' );
 }
-add_action( 'groups_join_group',   'groups_clear_group_user_object_cache', 10, 2 );
-add_action( 'groups_leave_group',  'groups_clear_group_user_object_cache', 10, 2 );
-add_action( 'groups_ban_member',   'groups_clear_group_user_object_cache', 10, 2 );
-add_action( 'groups_unban_member', 'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_join_group',    'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_leave_group',   'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_ban_member',    'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_unban_member',  'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_uninvite_user', 'groups_clear_group_user_object_cache', 10, 2 );
+add_action( 'groups_remove_member', 'groups_clear_group_user_object_cache', 10, 2 );
 
 /* List actions to clear super cached pages on, if super cache is installed */
 add_action( 'groups_join_group',                 'bp_core_clear_cache' );

bp-groups/bp-groups-functions.php

@@ -299 +299 @@
         // 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
-        bp_update_user_meta( $user_id, 'total_group_count', (int) bp_get_user_meta( $user_id, 'total_group_count', true ) - 1 );
+        // Modify user's group membership count
+        bp_update_user_meta( $user_id, 'total_group_count', (int) groups_total_groups_for_user( $user_id ) );
 
         /**
          * If the user joined this group less than five minutes ago, remove the
@@ -364 +364 @@
         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', bp_core_current_time() );
 
+        // Modify user's group membership count
+        bp_update_user_meta( $user_id, 'total_group_count', (int) groups_total_groups_for_user( $user_id ) );
+
         do_action( 'groups_join_group', $group_id, $user_id );
 
         return true;