Changeset 12186

Timestamp:

07/10/2018 05:05:15 PM (7 years ago)

Author:

r-a-y

Message:

Friends: Fix fatal error when the Activity component is disabled and when attempting to remove a friend.

During some refactoring to only load the Friends activity module
conditionally (r11932), a spot was missed during the remove friends
routine, causing a fatal error if the Activity component is disabled.

Props thejimmy.
Anti-props r-a-y.

See #7920 (trunk)

Location:

trunk/src/bp-friends

Files:

• bp-friends-activity.php (modified) (1 diff)
• bp-friends-functions.php (modified) (1 diff)

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

@@ -410 +410 @@
 }
 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' );

trunk/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 ) );
 
     /**