Ticket #7436: 7436.purge-incremented-cache.patch

src/bp-friends/bp-friends-cache.php

@@ -51 +51 @@
 
         // Clear the friendship object cache.
         wp_cache_delete( $friendship_id, 'bp_friends_friendships' );
+
+        // Clear incremented cache.
+        $friendship = new stdClass;
+        $friendship->initiator_user_id = $initiator_user_id;
+        $friendship->friend_user_id    = $friend_user_id;
+        bp_friends_delete_cached_friendships_on_friendship_save( $friendship );
 }
 add_action( 'friends_friendship_requested', 'bp_friends_clear_bp_friends_friendships_cache', 10, 3 );
 add_action( 'friends_friendship_accepted',  'bp_friends_clear_bp_friends_friendships_cache', 10, 3 );
@@ -71 +77 @@
 
         // Clear the friendship object cache.
         wp_cache_delete( $friendship_id, 'bp_friends_friendships' );
+
+        // Clear incremented cache.
+        bp_friends_delete_cached_friendships_on_friendship_save( $friendship );
 }
 add_action( 'friends_friendship_withdrawn', 'bp_friends_clear_bp_friends_friendships_cache_remove', 10, 2 );
 add_action( 'friends_friendship_rejected',  'bp_friends_clear_bp_friends_friendships_cache_remove', 10, 2 );

tests/phpunit/testcases/friends/functions.php

@@ -279 +279 @@
                 return $value;
         }
 
+        /**
+         * @group friends_remove_friend
+         */
+        public function test_friends_check_is_friend_after_remove() {
+                $now = time();
+                $old_user = get_current_user_id();
+                $u1 = $this->factory->user->create( array(
+                        'last_activity' => date( 'Y-m-d H:i:s', $now ),
+                ) );
+                $u2 = $this->factory->user->create( array(
+                        'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
+                ) );
+
+                /*
+                 * Pretend user 1 is on the Members Directory page.
+                 *
+                 * Also primes the friendship cache in the process.
+                 * @see bp_friends_filter_user_query_populate_extras()
+                 */
+                $this->set_current_user( $u1 );
+                ob_start();
+                bp_get_template_part( 'members/members-loop' );
+                ob_end_clean();
+
+                // User 1 initiates friendship.
+                friends_add_friend( $u1, $u2 );
+
+                /*
+                 * Pretend user 2 is logged in and accepts friendship.
+                 *
+                 * User 2 needs to be logged in for friends_accept_friendship() to work
+                 * properly.
+                 */
+                $this->set_current_user( $u2 );
+                friends_accept_friendship( friends_get_friendship_id( $u1, $u2 ) );
+
+                // Afterwards, user 1 decides to cancel friendship.
+                $this->set_current_user( $u1 );
+                friends_remove_friend( $u1, $u2 );
+
+                // Assert that users are no longer friends.
+                $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
+
+                $this->set_current_user( $old_user );
+        }
+
         /**
          * @group friendship_caching
          */