Ticket #5733: 5733.patch

content/plugins/buddypress/bp-activity/bp-activity-admin.php

@@ -506 +506 @@
                 $result = $activity->save();
 
                 // Clear the activity stream first page cache, in case this activity's timestamp was changed
-                wp_cache_delete( 'bp_activity_sitewide_front', 'bp_activity' );
+                wp_cache_delete( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
 
                 // Check for any error during activity save
                 if ( false === $result )

content/plugins/buddypress/bp-activity/bp-activity-functions.php

@@ -1043 +1043 @@
         // Attempt to return a cached copy of the first page of sitewide activity.
         if ( ( 1 === (int) $r['page'] ) && empty( $r['max'] ) && empty( $r['search_terms'] ) && empty( $r['meta_query'] ) && empty( $r['date_query'] ) && empty( $r['filter'] ) && empty( $r['exclude'] ) && empty( $r['in'] ) && ( 'DESC' === $r['sort'] ) && empty( $r['exclude'] ) && ( 'ham_only' === $r['spam'] ) ) {
 
-                $activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp_activity' );
+                $activity = wp_cache_get( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
                 if ( false === $activity ) {
 
                         $activity = BP_Activity_Activity::get( array(
@@ -1062 +1062 @@
                                 'count_total'       => $r['count_total'],
                         ) );
 
-                        wp_cache_set( 'bp_activity_sitewide_front', $activity, 'bp_activity' );
+                        wp_cache_set( 'bp_activity_sitewide_front', $activity, bp_core_get_global_cache_key() );
                 }
 
         } else {
@@ -1232 +1232 @@
                 BP_Activity_Activity::rebuild_activity_comment_tree( $activity->item_id );
         }
 
-        wp_cache_delete( 'bp_activity_sitewide_front', 'bp_activity' );
+        wp_cache_delete( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
         do_action( 'bp_activity_add', $r );
 
         return $activity->id;
@@ -1495 +1495 @@
         do_action( 'bp_activity_delete', $args );
         do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
 
-        wp_cache_delete( 'bp_activity_sitewide_front', 'bp_activity' );
+        wp_cache_delete( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
 
         return true;
 }
@@ -1817 +1817 @@
         $activity->is_spam = 1;
 
         // Clear the activity stream first page cache
-        wp_cache_delete( 'bp_activity_sitewide_front', 'bp_activity' );
+        wp_cache_delete( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
 
         // Clear the activity comment cache for this activity item
         wp_cache_delete( $activity->id, 'bp_activity_comments' );
@@ -1855 +1855 @@
         $activity->is_spam = 0;
 
         // Clear the activity stream first page cache
-        wp_cache_delete( 'bp_activity_sitewide_front', 'bp_activity' );
+        wp_cache_delete( 'bp_activity_sitewide_front', bp_core_get_global_cache_key() );
 
         // Clear the activity comment cache for this activity item
         wp_cache_delete( $activity->id, 'bp_activity_comments' );

content/plugins/buddypress/bp-blogs/bp-blogs-cache.php

@@ -43 +43 @@
  * @param int $user_id ID of the user whose blog cache should be cleared.
  */
 function bp_blogs_clear_blog_object_cache( $blog_id, $user_id ) {
-        wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, 'bp' );
-        wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+        wp_cache_delete( 'bp_blogs_of_user_'        . $user_id, bp_core_get_global_cache_key() );
+        wp_cache_delete( 'bp_total_blogs_for_user_' . $user_id, bp_core_get_global_cache_key() );
 }
 
 /**
@@ -57 +57 @@
  */
 function bp_blogs_format_clear_blog_cache( $recorded_blog_obj ) {
         bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
-        wp_cache_delete( 'bp_total_blogs', 'bp' );
+        wp_cache_delete( 'bp_total_blogs', bp_core_get_global_cache_key() );
 }
 
 // List actions to clear object caches on

content/plugins/buddypress/bp-blogs/bp-blogs-functions.php

@@ -1208 +1208 @@
  * @return int $count Total blog count.
  */
 function bp_blogs_total_blogs() {
-        if ( !$count = wp_cache_get( 'bp_total_blogs', 'bp' ) ) {
+        if ( !$count = wp_cache_get( 'bp_total_blogs', bp_core_get_global_cache_key() ) ) {
                 $blogs = BP_Blogs_Blog::get_all();
                 $count = $blogs['total'];
-                wp_cache_set( 'bp_total_blogs', $count, 'bp' );
+                wp_cache_set( 'bp_total_blogs', $count, bp_core_get_global_cache_key() );
         }
         return $count;
 }
@@ -1235 +1235 @@
                 return 0;
         }
 
-        $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' );
+        $count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, bp_core_get_global_cache_key() );
         if ( false === $count ) {
                 $count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
-                wp_cache_set( 'bp_total_blogs_for_user_' . $user_id, $count, 'bp' );
+                wp_cache_set( 'bp_total_blogs_for_user_' . $user_id, $count, bp_core_get_global_cache_key() );
         }
 
         return $count;

content/plugins/buddypress/bp-core/bp-core-cache.php

@@ -27 +27 @@
 }
 
 /**
- * Add 'bp' to global group of network wide cachable objects.
+ * Return global cache key filtered with `bp_core_get_global_cache_key`
+ *
+ * The filter is intended primarily for use in multiblog mode and multinetwork
+ * installations.
+ *
+ * @return string Filtered global cache key.
+ */
+function bp_core_get_global_cache_key() {
+        return apply_filters( 'bp_core_get_global_cache_key', 'bp' );
+}
+
+/**
+ * Return array of global cache groups, filtered with `bp_core_get_global_cache_groups`
+ *
+ * The filter is intended primarily for use in multiblog mode and multinetwork
+ * installations.
+ *
+ * @return array
+ */
+function bp_core_get_global_cache_groups() {
+        return apply_filters( 'bp_core_get_global_cache_groups', array( bp_core_get_global_cache_key() ) );
+}
+
+/**
+ * Add global cache group of network wide cachable objects.
  */
 function bp_core_add_global_group() {
         if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-                wp_cache_add_global_groups( array( 'bp' ) );
+                wp_cache_add_global_groups( bp_core_get_global_cache_groups() );
         }
 }
 add_action( 'bp_loaded', 'bp_core_add_global_group' );
@@ -40 +64 @@
  * Clear all cached objects for a user, or those that a user is part of.
  */
 function bp_core_clear_user_object_cache( $user_id ) {
-        wp_cache_delete( 'bp_user_' . $user_id, 'bp' );
+        wp_cache_delete( 'bp_user_' . $user_id, bp_core_get_global_cache_key() );
 }
 
 /**
  * Clear member count caches and transients.
  */
 function bp_core_clear_member_count_caches() {
-        wp_cache_delete( 'bp_total_member_count', 'bp' );
+        wp_cache_delete( 'bp_total_member_count', bp_core_get_global_cache_key() );
         delete_transient( 'bp_active_member_count' );
 }
 add_action( 'bp_core_activated_user',         'bp_core_clear_member_count_caches' );
@@ -79 +103 @@
                 return;
         }
 
-        wp_cache_delete( 'directory_pages', 'bp' );
+        wp_cache_delete( 'directory_pages', bp_core_get_global_cache_key() );
 }
 add_action( 'save_post', 'bp_core_clear_directory_pages_cache_page_edit' );
 
@@ -92 +116 @@
  */
 function bp_core_clear_directory_pages_cache_settings_edit( $option ) {
         if ( 'bp-pages' === $option ) {
-                wp_cache_delete( 'directory_pages', 'bp' );
+                wp_cache_delete( 'directory_pages', bp_core_get_global_cache_key() );
         }
 }
 add_action( 'update_option', 'bp_core_clear_directory_pages_cache_settings_edit' );
@@ -116 +140 @@
         ) );
 
         if ( in_array( $option, $keys ) ) {
-                wp_cache_delete( 'root_blog_options', 'bp' );
+                wp_cache_delete( 'root_blog_options', bp_core_get_global_cache_key() );
         }
 }
 add_action( 'update_option', 'bp_core_clear_root_options_cache' );

content/plugins/buddypress/bp-core/bp-core-classes.php

@@ -486 +486 @@
                 // only uncached users. However, BP does cache this data, so
                 // we set it here.
                 foreach ( $wp_user_query->results as $u ) {
-                        wp_cache_set( 'bp_core_userdata_' . $u->ID, $u, 'bp' );
+                        wp_cache_set( 'bp_core_userdata_' . $u->ID, $u, bp_core_get_global_cache_key() );
                 }
 
                 // We calculate total_users using a standalone query, except
@@ -828 +828 @@
                 }
 
                 // Cache a few things that are fetched often
-                wp_cache_set( 'bp_user_fullname_' . $this->id, $this->fullname, 'bp' );
-                wp_cache_set( 'bp_user_email_' . $this->id, $this->email, 'bp' );
-                wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
+                wp_cache_set( 'bp_user_fullname_' . $this->id, $this->fullname, bp_core_get_global_cache_key() );
+                wp_cache_set( 'bp_user_email_' . $this->id, $this->email, bp_core_get_global_cache_key() );
+                wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, bp_core_get_global_cache_key() );
 
                 $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );
                 $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );

content/plugins/buddypress/bp-core/bp-core-functions.php

@@ -416 +416 @@
         global $wpdb;
 
         // Look in cache first
-        $pages = wp_cache_get( 'directory_pages', 'bp' );
+        $pages = wp_cache_get( 'directory_pages', bp_core_get_global_cache_key() );
 
         if ( false === $pages ) {
 
@@ -460 +460 @@
                         }
                 }
 
-                wp_cache_set( 'directory_pages', $pages, 'bp' );
+                wp_cache_set( 'directory_pages', $pages, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_core_get_directory_pages', $pages );

content/plugins/buddypress/bp-core/bp-core-options.php

@@ -343 +343 @@
         // Check cache first - We cache here instead of using the standard WP
         // settings cache because the current blog may not be the root blog,
         // and it's not practical to access the cache across blogs
-        $root_blog_options_meta = wp_cache_get( 'root_blog_options', 'bp' );
+        $root_blog_options_meta = wp_cache_get( 'root_blog_options', bp_core_get_global_cache_key() );
 
         if ( false === $root_blog_options_meta ) {
                 $blog_options_keys      = "'" . join( "', '", (array) $root_blog_option_keys ) . "'";
@@ -426 +426 @@
                         unset( $root_blog_options );
                 }
 
-                wp_cache_set( 'root_blog_options', $root_blog_options_meta, 'bp' );
+                wp_cache_set( 'root_blog_options', $root_blog_options_meta, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_core_get_root_options', $root_blog_options_meta );

content/plugins/buddypress/bp-core/deprecated/2.1.php

@@ -104 +104 @@
         if ( !is_multisite() )
                 return false;
 
-        $blogs = wp_cache_get( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', 'bp' );
+        $blogs = wp_cache_get( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', bp_core_get_global_cache_key() );
         if ( empty( $blogs ) ) {
                 $blogs = bp_blogs_get_blogs_for_user( bp_loggedin_user_id(), true );
-                wp_cache_set( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', $blogs, 'bp' );
+                wp_cache_set( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', $blogs, bp_core_get_global_cache_key() );
         }
 
         $counter = 0;

content/plugins/buddypress/bp-friends/bp-friends-cache.php

@@ -23 +23 @@
         if ( !$friendship = new BP_Friends_Friendship( $friendship_id ) )
                 return false;
 
-        wp_cache_delete( 'friends_friend_ids_' .    $friendship->initiator_user_id, 'bp' );
-        wp_cache_delete( 'friends_friend_ids_' .    $friendship->friend_user_id,    'bp' );
+        wp_cache_delete( 'friends_friend_ids_' .    $friendship->initiator_user_id, bp_core_get_global_cache_key() );
+        wp_cache_delete( 'friends_friend_ids_' .    $friendship->friend_user_id,    bp_core_get_global_cache_key() );
 }
 
 // List actions to clear object caches on

content/plugins/buddypress/bp-friends/bp-friends-template.php

@@ -57 +57 @@
  */
 function bp_friends_random_friends() {
 
-        if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . bp_displayed_user_id(), 'bp' ) ) {
+        if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . bp_displayed_user_id(), bp_core_get_global_cache_key() ) ) {
                 $friend_ids = BP_Friends_Friendship::get_random_friends( bp_displayed_user_id() );
-                wp_cache_set( 'friends_friend_ids_' . bp_displayed_user_id(), $friend_ids, 'bp' );
+                wp_cache_set( 'friends_friend_ids_' . bp_displayed_user_id(), $friend_ids, bp_core_get_global_cache_key() );
         } ?>
 
         <div class="info-group">
@@ -105 +105 @@
  */
 function bp_friends_random_members( $total_members = 5 ) {
 
-        if ( !$user_ids = wp_cache_get( 'friends_random_users', 'bp' ) ) {
+        if ( !$user_ids = wp_cache_get( 'friends_random_users', bp_core_get_global_cache_key() ) ) {
                 $user_ids = BP_Core_User::get_users( 'random', $total_members );
-                wp_cache_set( 'friends_random_users', $user_ids, 'bp' );
+                wp_cache_set( 'friends_random_users', $user_ids, bp_core_get_global_cache_key() );
         }
 
         ?>
@@ -441 +441 @@
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
                         $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
-                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
+                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, bp_core_get_global_cache_key() );
                 }
 
                 return apply_filters( 'bp_get_friend_friendship_id', $friendship_id );
@@ -463 +463 @@
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
                         $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
-                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
+                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, bp_core_get_global_cache_key() );
                 }
 
                 return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
@@ -485 +485 @@
 
                 if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
                         $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
-                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
+                        wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, bp_core_get_global_cache_key() );
                 }
 
                 return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );

content/plugins/buddypress/bp-groups/bp-groups-cache.php

@@ -48 +48 @@
  * @param $group_id Not used.
  */
 function groups_clear_group_object_cache( $group_id ) {
-        wp_cache_delete( 'bp_total_group_count', 'bp' );
+        wp_cache_delete( 'bp_total_group_count', bp_core_get_global_cache_key() );
 }
 add_action( 'groups_group_deleted',              'groups_clear_group_object_cache' );
 add_action( 'groups_settings_updated',           'groups_clear_group_object_cache' );
@@ -164 +164 @@
  * @param int $user_id The user ID.
  */
 function groups_clear_group_user_object_cache( $group_id, $user_id ) {
-        wp_cache_delete( 'bp_total_groups_for_user_' . $user_id, 'bp' );
+        wp_cache_delete( 'bp_total_groups_for_user_' . $user_id, bp_core_get_global_cache_key() );
 }
 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 );

content/plugins/buddypress/bp-groups/bp-groups-functions.php

@@ -629 +629 @@
  * @return int
  */
 function groups_get_total_group_count() {
-        if ( !$count = wp_cache_get( 'bp_total_group_count', 'bp' ) ) {
+        if ( !$count = wp_cache_get( 'bp_total_group_count', bp_core_get_global_cache_key() ) ) {
                 $count = BP_Groups_Group::get_total_group_count();
-                wp_cache_set( 'bp_total_group_count', $count, 'bp' );
+                wp_cache_set( 'bp_total_group_count', $count, bp_core_get_global_cache_key() );
         }
 
         return $count;
@@ -669 +669 @@
         if ( empty( $user_id ) )
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
 
-        if ( !$count = wp_cache_get( 'bp_total_groups_for_user_' . $user_id, 'bp' ) ) {
+        if ( !$count = wp_cache_get( 'bp_total_groups_for_user_' . $user_id, bp_core_get_global_cache_key() ) ) {
                 $count = BP_Groups_Member::total_group_count( $user_id );
-                wp_cache_set( 'bp_total_groups_for_user_' . $user_id, $count, 'bp' );
+                wp_cache_set( 'bp_total_groups_for_user_' . $user_id, $count, bp_core_get_global_cache_key() );
         }
 
         return $count;

content/plugins/buddypress/bp-members/bp-members-functions.php

@@ -182 +182 @@
                 return false;
         }
 
-        if ( !$userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' ) ) {
+        if ( !$userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, bp_core_get_global_cache_key() ) ) {
                 $userdata = BP_Core_User::get_core_userdata( $user_id );
-                wp_cache_set( 'bp_core_userdata_' . $user_id, $userdata, 'bp' );
+                wp_cache_set( 'bp_core_userdata_' . $user_id, $userdata, bp_core_get_global_cache_key() );
         }
         return apply_filters( 'bp_core_get_core_userdata', $userdata );
 }
@@ -254 +254 @@
         $bp = buddypress();
 
         // Check cache for user nicename
-        $username = wp_cache_get( 'bp_user_username_' . $user_id, 'bp' );
+        $username = wp_cache_get( 'bp_user_username_' . $user_id, bp_core_get_global_cache_key() );
         if ( false === $username ) {
 
                 // Cache not found so prepare to update it
@@ -303 +303 @@
 
         // Add this to cache
         if ( ( true === $update_cache ) && !empty( $username ) ) {
-                wp_cache_set( 'bp_user_username_' . $user_id, $username, 'bp' );
+                wp_cache_set( 'bp_user_username_' . $user_id, $username, bp_core_get_global_cache_key() );
 
         // @todo bust this cache if no $username found?
         //} else {
@@ -329 +329 @@
 function bp_members_get_user_nicename( $user_id ) {
         $bp = buddypress();
 
-        if ( !$user_nicename = wp_cache_get( 'bp_members_user_nicename_' . $user_id, 'bp' ) ) {
+        if ( !$user_nicename = wp_cache_get( 'bp_members_user_nicename_' . $user_id, bp_core_get_global_cache_key() ) ) {
                 $update_cache = true;
 
                 // User ID matches logged in user
@@ -364 +364 @@
 
         // Add this to cache
         if ( true == $update_cache && !empty( $user_nicename ) ) {
-                wp_cache_set( 'bp_members_user_nicename_' . $user_id, $user_nicename, 'bp' );
+                wp_cache_set( 'bp_members_user_nicename_' . $user_id, $user_nicename, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_members_get_user_nicename', $user_nicename );
@@ -379 +379 @@
  */
 function bp_core_get_user_email( $uid ) {
 
-        if ( !$email = wp_cache_get( 'bp_user_email_' . $uid, 'bp' ) ) {
+        if ( !$email = wp_cache_get( 'bp_user_email_' . $uid, bp_core_get_global_cache_key() ) ) {
 
                 // User exists
                 $ud = bp_core_get_core_userdata( $uid );
@@ -391 +391 @@
                         $email = '';
                 }
 
-                wp_cache_set( 'bp_user_email_' . $uid, $email, 'bp' );
+                wp_cache_set( 'bp_user_email_' . $uid, $email, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_core_get_user_email', $email );
@@ -458 +458 @@
 
         $uncached_ids = array();
         foreach ( $user_ids as $user_id ) {
-                if ( false === wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
+                if ( false === wp_cache_get( 'bp_user_fullname_' . $user_id, bp_core_get_global_cache_key() ) ) {
                         $uncached_ids[] = $user_id;
                 }
         }
@@ -505 +505 @@
                 }
 
                 foreach ( $fullnames as $fuser_id => $fname ) {
-                        wp_cache_set( 'bp_user_fullname_' . $fuser_id, $fname, 'bp' );
+                        wp_cache_set( 'bp_user_fullname_' . $fuser_id, $fname, bp_core_get_global_cache_key() );
                 }
         }
 
         $retval = array();
         foreach ( $user_ids as $user_id ) {
-                $retval[ $user_id ] = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' );
+                $retval[ $user_id ] = wp_cache_get( 'bp_user_fullname_' . $user_id, bp_core_get_global_cache_key() );
         }
 
         return $retval;
@@ -597 +597 @@
 function bp_core_get_total_member_count() {
         global $wpdb;
 
-        if ( !$count = wp_cache_get( 'bp_total_member_count', 'bp' ) ) {
+        if ( !$count = wp_cache_get( 'bp_total_member_count', bp_core_get_global_cache_key() ) ) {
                 $status_sql = bp_core_get_status_sql();
                 $count = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users} WHERE {$status_sql}" );
-                wp_cache_set( 'bp_total_member_count', $count, 'bp' );
+                wp_cache_set( 'bp_total_member_count', $count, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_core_get_total_member_count', $count );

content/plugins/buddypress/bp-settings/bp-settings-actions.php

@@ -196 +196 @@
                 // Clear cached data, so that the changed settings take effect
                 // on the current page load
                 if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( $update_user ) ) ) {
-                        wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), 'bp' );
+                        wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), bp_core_get_global_cache_key() );
                         $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
                 }
 

content/plugins/buddypress/bp-xprofile/bp-xprofile-cache.php

@@ -121 +121 @@
 }
 
 function xprofile_clear_profile_groups_object_cache( $group_obj ) {
-        wp_cache_delete( 'xprofile_groups_inc_empty',        'bp' );
-        wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
+        wp_cache_delete( 'xprofile_groups_inc_empty',        bp_core_get_global_cache_key() );
+        wp_cache_delete( 'xprofile_group_' . $group_obj->id, bp_core_get_global_cache_key() );
 }
 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 ) {
-        wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), 'bp' );
+        wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), bp_core_get_global_cache_key() );
 }
 add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache'   );
 
@@ -142 +142 @@
  */
 function xprofile_clear_fullname_cache_on_profile_field_edit( $data ) {
         if ( 1 == $data->field_id ) {
-                wp_cache_delete( 'bp_user_fullname_' . $data->user_id, 'bp' );
+                wp_cache_delete( 'bp_user_fullname_' . $data->user_id, bp_core_get_global_cache_key() );
         }
 }
 add_action( 'xprofile_data_after_save', 'xprofile_clear_fullname_cache_on_profile_field_edit' );
@@ -156 +156 @@
  */
 function xprofile_clear_profile_field_object_cache( $field_obj ) {
         // Clear default visibility level cache
-        wp_cache_delete( 'xprofile_default_visibility_levels', 'bp' );
+        wp_cache_delete( 'xprofile_default_visibility_levels', bp_core_get_global_cache_key() );
 
         // 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' );
+        wp_cache_delete( 'xprofile_group_' . $field_obj->group_id, bp_core_get_global_cache_key() );
+        wp_cache_delete( 'xprofile_groups_inc_empty', bp_core_get_global_cache_key() );
 }
 add_action( 'xprofile_fields_saved_field', 'xprofile_clear_profile_field_object_cache' );
 add_action( 'xprofile_fields_deleted_field', 'xprofile_clear_profile_field_object_cache' );

content/plugins/buddypress/bp-xprofile/bp-xprofile-classes.php

@@ -26 +26 @@
         public function populate( $id ) {
                 global $wpdb, $bp;
 
-                $group = wp_cache_get( 'xprofile_group_' . $this->id, 'bp' );
+                $group = wp_cache_get( 'xprofile_group_' . $this->id, bp_core_get_global_cache_key() );
 
                 if ( false === $group ) {
                         $group = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id ) );
@@ -337 +337 @@
                 foreach ( $group_ids as $group_id ) {
 
                         // If cached data is found, use it
-                        if ( $group_data = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
+                        if ( $group_data = wp_cache_get( 'xprofile_group_' . $group_id, bp_core_get_global_cache_key() ) ) {
                                 $groups[ $group_id ] = $group_data;
 
                         // Otherwise leave a placeholder so we don't lose the order
@@ -362 +362 @@
                         // and add it to the cache
                         foreach ( (array) $queried_gdata as $gdata ) {
                                 $groups[ $gdata->id ] = $gdata;
-                                wp_cache_set( 'xprofile_group_' . $gdata->id, $gdata, 'bp' );
+                                wp_cache_set( 'xprofile_group_' . $gdata->id, $gdata, bp_core_get_global_cache_key() );
                         }
                 }
 
@@ -392 +392 @@
                 }
 
                 // purge profile field group cache
-                wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
+                wp_cache_delete( 'xprofile_groups_inc_empty', bp_core_get_global_cache_key() );
 
                 return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET group_order = %d WHERE id = %d", $position, $field_group_id ) );
         }
@@ -444 +444 @@
         public static function fetch_default_visibility_levels() {
                 global $wpdb, $bp;
 
-                $default_visibility_levels = wp_cache_get( 'xprofile_default_visibility_levels', 'bp' );
+                $default_visibility_levels = wp_cache_get( 'xprofile_default_visibility_levels', bp_core_get_global_cache_key() );
 
                 if ( false === $default_visibility_levels ) {
                         $levels = $wpdb->get_results( "SELECT object_id, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND ( meta_key = 'default_visibility' OR meta_key = 'allow_custom_visibility' )" );
@@ -459 +459 @@
                                 }
                         }
 
-                        wp_cache_set( 'xprofile_default_visibility_levels', $default_visibility_levels, 'bp' );
+                        wp_cache_set( 'xprofile_default_visibility_levels', $default_visibility_levels, bp_core_get_global_cache_key() );
                 }
 
                 return $default_visibility_levels;

content/plugins/buddypress/bp-xprofile/bp-xprofile-template.php

@@ -627 +627 @@
  * @return object $groups
  */
 function bp_profile_get_field_groups() {
-        $groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' );
+        $groups = wp_cache_get( 'xprofile_groups_inc_empty', bp_core_get_global_cache_key() );
 
         if ( empty( $groups ) ) {
                 $groups = bp_xprofile_get_groups( array( 'fetch_fields' => true ) );
-                wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
+                wp_cache_set( 'xprofile_groups_inc_empty', $groups, bp_core_get_global_cache_key() );
         }
 
         return apply_filters( 'bp_profile_get_field_groups', $groups );
@@ -696 +696 @@
                 if ( !is_numeric( $group_id ) )
                         $group_id = 1;
 
-                if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, 'bp' ) ) {
+                if ( !$group = wp_cache_get( 'xprofile_group_' . $group_id, bp_core_get_global_cache_key() ) ) {
                         $group = new BP_XProfile_Group($group_id);
-                        wp_cache_set( 'xprofile_group_' . $group_id, $group, 'bp' );
+                        wp_cache_set( 'xprofile_group_' . $group_id, $group, bp_core_get_global_cache_key() );
                 }
 
                 return apply_filters( 'bp_get_profile_group_name', $group->name );