Changeset 7791

Timestamp:

02/05/2014 07:16:55 PM (11 years ago)

Author:

boonebgorges

Message:

Improve cache invalidation for xprofile groups

XProfile groups are cached in two ways: individually and as a collection. This
changeset improves group cache invalidation by ensuring that both of these
caches are wiped when child fields are added or edited.

See #1332

Location:

trunk/bp-xprofile

Files:

• bp-xprofile-cache.php (modified) (2 diffs)
• bp-xprofile-classes.php (modified) (2 diffs)

trunk/bp-xprofile/bp-xprofile-cache.php

@@ -18 +18 @@
     wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
 }
-add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_groups_saved_group',   'xprofile_clear_profile_groups_object_cache' );
+add_action( 'xprofile_group_after_delete', 'xprofile_clear_profile_groups_object_cache' );
+add_action( 'xprofile_group_after_save',   'xprofile_clear_profile_groups_object_cache' );
 
 function xprofile_clear_profile_data_object_cache( $group_id ) {
@@ -36 +36 @@
     // Clear default visibility level cache
     wp_cache_delete( 'xprofile_default_visibility_levels', 'bp' );
+
+    // Modified fields can alter parent group status, in particular when
+    // the group goes from empty to non-empty. Bust its cache, as well as
+    // the global group_inc_empty cache
+    wp_cache_delete( 'xprofile_group_' . $field_obj->group_id, 'bp' );
+    wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
 }
 add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -75 +75 @@
             return false;
 
+        do_action_ref_array( 'xprofile_group_before_delete', array( &$this ) );
+
         // Delete field group
         if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id ) ) ) {
@@ -88 +90 @@
                 }
             }
+
+            do_action_ref_array( 'xprofile_group_after_delete', array( &$this ) );
 
             return true;