Changeset 6100

Timestamp:

06/14/2012 08:12:59 PM (14 years ago)

Author:

djpaul

Message:

When a group is created or deleted, clear each group member's "total groups count" cache.
Addresses a bug where the counts never changed in an environment with a persistent object cache.

• See #4226
• Specify cache group for to wp_cache_delete() in groups_clear_group_user_object_cache().
• Add $user_ids parameter to the 'bp_groups_delete_group' action to save a repeat DB query later.
• Add $group object parameter to the 'groups_created_group' action.

Location:

trunk/bp-groups

Files:

• bp-groups-cache.php (modified) (1 diff)
• bp-groups-classes.php (modified) (1 diff)
• bp-groups-functions.php (modified) (1 diff)

trunk/bp-groups/bp-groups-cache.php

@@ -50 +50 @@
 add_action( 'groups_create_group_step_complete', 'groups_clear_group_object_cache' );
 
+/**
+ * Clears caches for the group creator when a group is created
+ *
+ * @param int $group_id
+ * @param BP_Groups_Group $group_obj
+ * @since BuddyPress (1.6)
+ */
+function bp_groups_clear_group_creator_cache( $group_id, $group_obj ) {
+        // Clears the 'total groups' for this user
+        groups_clear_group_user_object_cache( $group_obj->id, $group_obj->creator_id );
+}
+add_action( 'groups_created_group', 'bp_groups_clear_group_creator_cache', 10, 2 );
+
+/**
+ * Clears caches for all members in a group when a group is deleted
+ *
+ * @param BP_Groups_Group $group_obj
+ * @param array User IDs who were in this group
+ * @since BuddyPress (1.6)
+ */
+function bp_groups_clear_group_members_caches( $group_obj, $user_ids ) {
+        // Clears the 'total groups' cache for each member in a group
+        foreach ( (array) $user_ids as $user_id )
+                groups_clear_group_user_object_cache( $group_obj->id, $user_id );
+}
+add_action( 'bp_groups_delete_group', 'bp_groups_clear_group_members_caches', 10, 2 );
+
 function groups_clear_group_user_object_cache( $group_id, $user_id ) {
-        wp_cache_delete( 'bp_total_groups_for_user_' . $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 );

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

@@ -173 +173 @@
 
                 // Fetch the user IDs of all the members of the group
-                $user_ids = BP_Groups_Member::get_group_member_ids( $this->id );
-                $user_ids = implode( ',', (array) $user_ids );
+                $user_ids    = BP_Groups_Member::get_group_member_ids( $this->id );
+                $user_id_str = implode( ',', (array) $user_ids );
 
                 // Modify group count usermeta for members
-                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_ids} )" ) );
+                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_id_str} )" ) );
 
                 // Now delete all group member entries
                 BP_Groups_Member::delete_all( $this->id );
 
-                do_action_ref_array( 'bp_groups_delete_group', array( &$this ) );
+                do_action_ref_array( 'bp_groups_delete_group', array( &$this, $user_ids ) );
 
                 wp_cache_delete( 'bp_groups_group_' . $this->id, 'bp' );

trunk/bp-groups/bp-groups-functions.php

@@ -130 +130 @@
         }
 
-        do_action( 'groups_created_group', $group->id );
+        do_action( 'groups_created_group', $group->id, $group );
 
         return $group->id;