Changeset 4562

Timestamp:

06/24/2011 08:17:29 PM (14 years ago)

Author:

boonebgorges

Message:

Ensures that activity items corresponding to all child posts are deleted when the entire topic thread is deleted. Fixes #3300 for 1.2 branch

File:

• branches/1.2/bp-groups.php (modified) (1 diff)

branches/1.2/bp-groups.php

@@ -2171 +2171 @@
     global $bp;
 
+    // Before deleting the thread, get the post ids so that their activity items can be deleted
+    $posts = bp_forums_get_topic_posts( array( 'topic_id' => $topic_id, 'per_page' => -1 ) );
+
     if ( bp_forums_delete_topic( array( 'topic_id' => $topic_id ) ) ) {
-        /* Delete the activity stream item */
-        if ( function_exists( 'bp_activity_delete' ) ) {
+        do_action( 'groups_before_delete_group_forum_topic', $topic_id );
+
+        // Delete the activity stream items
+        if ( bp_is_active( 'activity' ) ) {
+            // The activity item for the initial topic
             bp_activity_delete( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component' => $bp->groups->id, 'type' => 'new_forum_topic' ) );
+            
+            // The activity item for each post
+            foreach ( (array)$posts as $post ) {
+                bp_activity_delete( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post->post_id, 'component' => $bp->groups->id, 'type' => 'new_forum_post' ) );
+            }
         }