Changeset 3772

Timestamp:

01/20/2011 06:25:30 PM (14 years ago)

Author:

djpaul

Message:

Add before delete hooks to Friends and Activity components (see #2773). Props kunalb

Location:

trunk

Files:

• bp-activity/bp-activity-actions.php (modified) (2 diffs)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-friends/bp-friends-loader.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (4 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -87 +87 @@
 
     // Call the action before the delete so plugins can still fetch information about it
-    do_action( 'bp_activity_action_delete_activity', $activity_id, $activity->user_id );
+    do_action( 'bp_activity_before_action_delete_activity', $activity_id, $activity->user_id );
 
     // Delete the activity item and provide user feedback
@@ -94 +94 @@
     else
         bp_core_add_message( __( 'There was an error when deleting that activity', 'buddypress' ), 'error' );
+
+    do_action( 'bp_activity_action_delete_activity', $activity_id, $activity->user_id );
 
     // Redirect

trunk/bp-activity/bp-activity-functions.php

@@ -771 +771 @@
         $user_id = $args['user_id'];
 
+    do_action( 'bp_before_activity_delete', $args );
+
     $latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
     if ( !empty( $latest_update ) ) {

trunk/bp-friends/bp-friends-loader.php

@@ -380 +380 @@
     $friendship    = new BP_Friends_Friendship( $friendship_id );
 
+    do_action( 'friends_before_friendship_delete', $friendship_id, $initiator_userid, $friend_userid );
+
     // Remove the activity stream item for the user who canceled the friendship
     friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
@@ -590 +592 @@
     global $bp;
 
+    do_action( 'friends_before_remove_data', $user_id );
+
     BP_Friends_Friendship::delete_all_for_user($user_id);
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -245 +245 @@
 
     // Call the action before the delete so plugins can still fetch information about it
-    do_action( 'bp_activity_action_delete_activity', $_POST['id'], $activity->user_id );
+    do_action( 'bp_activity_before_action_delete_activity', $_POST['id'], $activity->user_id );
 
     if ( !bp_activity_delete( array( 'id' => $_POST['id'], 'user_id' => $activity->user_id ) ) ) {
@@ -252 +252 @@
     }
 
+    do_action( 'bp_activity_action_delete_activity', $_POST['id'], $activity->user_id );
+
     return true;
 }
@@ -278 +280 @@
 
     /* Call the action before the delete so plugins can still fetch information about it */
-    do_action( 'bp_activity_action_delete_activity', $_POST['id'], $comment->user_id );
+    do_action( 'bp_activity_before_action_delete_activity', $_POST['id'], $comment->user_id );
 
     if ( !bp_activity_delete_comment( $comment->item_id, $comment->id ) ) {
@@ -284 +286 @@
         return false;
     }
+
+    do_action( 'bp_activity_action_delete_activity', $_POST['id'], $comment->user_id );
 
     return true;