Ticket #8590: 8590.patch

src/bp-core/classes/class-bp-core.php

@@ -311 +311 @@
 
                 // Global groups.
                 wp_cache_add_global_groups( array(
-                        'bp'
+                        'bp',
+                        'bp_pages',
+                        'bp_invitations',
                 ) );
 
                 parent::setup_cache_groups();

src/bp-friends/bp-friends-template.php

@@ -569 +569 @@
         function bp_get_friend_friendship_id() {
                 global $members_template;
 
-                if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+                if ( ! $friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), 'bp' ) ) {
                         $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' );
                 }
@@ -604 +604 @@
         function bp_get_friend_accept_request_link() {
                 global $members_template;
 
-                if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+                if ( ! $friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), 'bp' ) ) {
                         $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' );
                 }
@@ -641 +641 @@
         function bp_get_friend_reject_request_link() {
                 global $members_template;
 
-                if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+                if ( ! $friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), 'bp' ) ) {
                         $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' );
                 }

src/bp-groups/classes/class-bp-groups-component.php

@@ -962 +962 @@
         public function setup_cache_groups() {
 
                 // Global groups.
-                wp_cache_add_global_groups( array(
-                        'bp_groups',
-                        'bp_group_admins',
-                        'bp_group_invite_count',
-                        'group_meta',
-                        'bp_groups_memberships',
-                        'bp_groups_memberships_for_user',
-                ) );
+                wp_cache_add_global_groups(
+                        array(
+                                'bp_groups',
+                                'bp_group_admins',
+                                'bp_group_invite_count',
+                                'group_meta',
+                                'bp_groups_memberships',
+                                'bp_groups_memberships_for_user',
+                                'bp_group_mods',
+                                'bp_groups_invitations_as_memberships',
+                                'bp_groups_group_type',
+                        )
+                );
 
                 parent::setup_cache_groups();
         }

src/bp-members/classes/class-bp-members-component.php

@@ -724 +724 @@
                 // Global groups.
                 wp_cache_add_global_groups( array(
                         'bp_last_activity',
-                        'bp_member_type'
+                        'bp_member_member_type',
                 ) );
 
                 parent::setup_cache_groups();

src/bp-notifications/classes/class-bp-notifications-component.php

@@ -311 +311 @@
                 // Global groups.
                 wp_cache_add_global_groups( array(
                         'bp_notifications',
-                        'notification_meta'
+                        'notification_meta',
+                        'bp_notifications_unread_count',
+                        'bp_notifications_grouped_notifications',
                 ) );
 
                 parent::setup_cache_groups();

tests/phpunit/testcases/members/types.php

@@ -266 +266 @@
                         wp_delete_user( $u );
                 }
 
-                $this->assertFalse( wp_cache_get( $u, 'bp_member_type' ) );
+                $this->assertFalse( wp_cache_get( $u, 'bp_member_member_type' ) );
                 $this->assertFalse( bp_get_member_type( $u ) );
         }