Ticket #5711: 5711.02.patch

src/bp-groups/bp-groups-cache.php

@@ -173 +173 @@
 add_action( 'groups_uninvite_user', 'groups_clear_group_user_object_cache', 10, 2 );
 add_action( 'groups_remove_member', 'groups_clear_group_user_object_cache', 10, 2 );
 
+/**
+ * Clear group administrator cache.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param int $group_id The group ID.
+ */
+function groups_clear_group_administrator_cache( $group_id ) {
+        wp_cache_delete( $group_id, 'bp_group_admins' );
+}
+add_action( 'groups_promote_member', 'groups_clear_group_administrator_cache' );
+add_action( 'groups_demote_member',  'groups_clear_group_administrator_cache' );
+add_action( 'groups_delete_group',   'groups_clear_group_administrator_cache' );
+
+/**
+ * Clear group administrator cache when a group member is saved.
+ *
+ * This accounts for situations where group administrators are added manually
+ * using {@link BP_Groups_Member::save()}.  Usually via a plugin.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param BP_Groups_Member $member
+ */
+function groups_clear_group_administrator_cache_on_member_save( BP_Groups_Member $member ) {
+        groups_clear_group_administrator_cache( $member->group_id );
+}
+add_action( 'groups_member_after_save', 'groups_clear_group_administrator_cache_on_member_save' );
+
 /* List actions to clear super cached pages on, if super cache is installed */
 add_action( 'groups_join_group',                 'bp_core_clear_cache' );
 add_action( 'groups_leave_group',                'bp_core_clear_cache' );

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

@@ -2626 +2626 @@
         public static function get_group_administrator_ids( $group_id ) {
                 global $bp, $wpdb;
 
-                return $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_admin = 1 AND is_banned = 0", $group_id ) );
+                $group_admins = wp_cache_get( $group_id, 'bp_group_admins' );
+
+                if ( false === $group_admins ) {
+                        $group_admins = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified FROM {$bp->groups->table_name_members} WHERE group_id = %d AND is_admin = 1 AND is_banned = 0", $group_id ) );
+
+                        wp_cache_set( $group_id, $group_admins, 'bp_group_admins' );
+                }
+
+                return $group_admins;
         }
 
         /**

tests/phpunit/includes/testcase.php

@@ -336 +336 @@
         public static function add_user_to_group( $user_id, $group_id, $args = array() ) {
                 $r = wp_parse_args( $args, array(
                         'date_modified' => bp_core_current_time(),
-                        'is_confirmed' => 1,
-                        'invite_sent' => 0,
-                        'inviter_id' => 0,
+                        'is_confirmed'  => 1,
+                        'is_admin'      => 0,
+                        'invite_sent'   => 0,
+                        'inviter_id'    => 0,
                 ) );
 
                 $new_member                = new BP_Groups_Member;
                 $new_member->group_id      = $group_id;
                 $new_member->user_id       = $user_id;
                 $new_member->inviter_id    = 0;
-                $new_member->is_admin      = 0;
+                $new_member->is_admin      = $r['is_admin'];
                 $new_member->user_title    = '';
                 $new_member->date_modified = $r['date_modified'];
                 $new_member->is_confirmed  = $r['is_confirmed'];

tests/phpunit/testcases/groups/cache.php

@@ -154 +154 @@
                 $this->assertNotEmpty( wp_cache_get( $g1, 'bp_groups' ) );
                 $this->assertNotEmpty( wp_cache_get( $g2, 'bp_groups' ) );
         }
+
+        /**
+         * @group groups_get_group_admins
+         */
+        public function test_groups_get_group_admins_cache() {
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+                // prime cache
+                groups_get_group_admins( $g );
+
+                // promote user 2 to an admin
+                bp_update_is_item_admin( true );
+                groups_promote_member( $u2, $g, 'admin' );
+
+                // assert that cache is invalidated
+                $this->assertEmpty( wp_cache_get( $g, 'bp_group_admins' ) );
+
+                // assert new cached value
+                $this->assertEquals( 2, count( groups_get_group_admins( $g ) ) );
+        }
+
+        /**
+         * @group groups_get_group_admins
+         */
+        public function test_groups_get_group_admins_cache_on_member_save() {
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+                $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
+
+                // prime cache
+                groups_get_group_admins( $g );
+
+                // promote user 2 to an admin via BP_Groups_Member::save()
+                self::add_user_to_group( $u2, $g, array( 'is_admin' => 1 ) );
+
+                // assert that cache is invalidated
+                $this->assertEmpty( wp_cache_get( $g, 'bp_group_admins' ) );
+
+                // assert new cached value
+                $this->assertEquals( 2, count( groups_get_group_admins( $g ) ) );
+        }
 }