Ticket #7920: 7920.01.patch

src/bp-friends/bp-friends-activity.php

@@ -409 +409 @@
         ) );
 }
 add_action( 'friends_remove_data', 'bp_friends_delete_activity_on_user_delete' );
+
+/**
+ * Remove friendship activity item when a friendship is deleted.
+ *
+ * @since 3.2.0
+ *
+ * @param int $friendship_id ID of the friendship.
+ */
+function bp_friends_delete_activity_on_friendship_delete( $friendship_id ) {
+        friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_created', 'user_id' => 0 ) );
+}
+add_action( 'friends_friendship_deleted', 'bp_friends_delete_activity_on_friendship_delete' );

src/bp-friends/bp-friends-functions.php

@@ -115 +115 @@
          */
         do_action( 'friends_before_friendship_delete', $friendship_id, $initiator_userid, $friend_userid );
 
-        // Remove the activity stream items about the friendship id.
-        friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_created', 'user_id' => 0 ) );
-
         /**
          * Fires before the friendship connection is removed.
          *