Ticket #6890: 6890.diff

src/bp-activity/bp-activity-functions.php

@@ -2202 +2202 @@
                 'user_id'           => false,
         );
 
-        $deleted = bp_activity_delete_by_item_id( $delete_activity_args );
+        $deleted = bp_activity_delete( $r );
 
         /**
          * Fires after the unpublishing for the custom post type.
@@ -2450 +2450 @@
         $deleted = false;
 
         if ( bp_disable_blogforum_comments() ) {
-                $deleted = bp_activity_delete_by_item_id( array(
+                $r =  array(
                         'item_id'           => get_current_blog_id(),
                         'secondary_item_id' => $comment_id,
                         'component'         => $activity_comment_object->component_id,
                         'type'              => $activity_comment_object->action_id,
                         'user_id'           => false,
-                ) );
+                );
+                $deleted = bp_activity_delete( $r );
         }
 
         /**

src/bp-blogs/bp-blogs-activity.php

@@ -515 +515 @@
                 'secondary_item_id' => false
         ) );
 
-        bp_activity_delete_by_item_id( $r );
+        bp_activity_delete( $r );
 }
 
 /**

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

@@ -75 +75 @@
         if ( ! bp_is_active( 'activity' ) ) {
                 return;
         }
-
-        bp_activity_delete_by_item_id( array(
+        $r  = bp_parse_args( $args, array(
                 'component' => buddypress()->friends->id,
-                'item_id'   => $args['item_id'],
-                'type'      => $args['type'],
-                'user_id'   => $args['user_id']
+                'item_id'   => false,
+                'type'      => false,
+                'user_id'   => false
         ) );
+        bp_activity_delete( $r );
 }
 
 /**

src/bp-groups/bp-groups-activity.php

@@ -525 +525 @@
  */
 function bp_groups_delete_group_delete_all_activity( $group_id ) {
         if ( bp_is_active( 'activity' ) ) {
-                bp_activity_delete_by_item_id( array(
+                $r = array(
                         'item_id'   => $group_id,
-                        'component' => buddypress()->groups->id
-                ) );
+                        'component' => buddypress()->groups->id,
+                        );
+                bp_activity_delete( $r );
         }
 }
 add_action( 'groups_delete_group', 'bp_groups_delete_group_delete_all_activity', 10 );

src/bp-xprofile/bp-xprofile-activity.php

@@ -164 +164 @@
         ), 'xprofile_delete_activity' );
 
         // Delete the activity item.
-        bp_activity_delete_by_item_id( $r );
+        bp_activity_delete( $r );
 }
 
 /**