Changeset 9533 for trunk/src/bp-members/bp-members-cache.php

Timestamp:

02/23/2015 01:39:05 AM (11 years ago)

Author:

boonebgorges

Message:

Use 'bp_member_member_type' as the member type cache bucket name.

Using 'bp_member_type' was creating the potential for collisions between WP's
taxonomy cache (which uses the taxonomy name 'bp_member_type' and term IDs as
cache keys) and BP's per-member member type cache (which uses the bucket
'bp_member_type' and user IDs as cache keys). The collisions take place only
when there is a 'bp_member_type' term ID that overlaps with a user ID.

The new cache group 'bp_member_member_type' is chosen to underscore that what's
being cached is the relationship between individual members and the user types
to which they belong.

Props imath, johnjamesjacoby.
Fixes #6242.

File:

• trunk/src/bp-members/bp-members-cache.php (modified) (4 diffs)

trunk/src/bp-members/bp-members-cache.php

@@ -15 +15 @@
  */
 function bp_members_prefetch_member_type( BP_User_Query $bp_user_query ) {
-    $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_type' );
+    $uncached_member_ids = bp_get_non_cached_ids( $bp_user_query->user_ids, 'bp_member_member_type' );
 
     $member_types = bp_get_object_terms( $uncached_member_ids, 'bp_member_type', array(
@@ -33 +33 @@
     $cached_member_ids = array();
     foreach ( $keyed_member_types as $user_id => $user_member_types ) {
-        wp_cache_set( $user_id, $user_member_types, 'bp_member_type' );
+        wp_cache_set( $user_id, $user_member_types, 'bp_member_member_type' );
         $cached_member_ids[] = $user_id;
     }
@@ -39 +39 @@
     // Cache an empty value for users with no type.
     foreach ( array_diff( $uncached_member_ids, $cached_member_ids ) as $no_type_id ) {
-        wp_cache_set( $no_type_id, '', 'bp_member_type' );
+        wp_cache_set( $no_type_id, '', 'bp_member_member_type' );
     }
 }
@@ -54 +54 @@
  */
 function bp_members_clear_member_type_cache( $user_id ) {
-    wp_cache_delete( $user_id, 'bp_member_type' );
+    wp_cache_delete( $user_id, 'bp_member_member_type' );
 }
 add_action( 'wpmu_delete_user', 'bp_members_clear_member_type_cache' );