Ticket #2613: patch-2613.patch

bp-groups.php

@@ -1620 +1620 @@
         return true;
 }
 
+/**
+ * Delete a group and all of its associated meta
+ *
+ * @global object $bp BuddyPress global settings
+ * @param int $group_id
+ * @since 1.0
+ */
 function groups_delete_group( $group_id ) {
         global $bp;
 
@@ -1627 +1634 @@
         if ( !$bp->is_item_admin )
                 return false;
 
+        $forum_id = groups_get_groupmeta( $group_id, 'forum_id' );
+
         // Get the group object
         $group = new BP_Groups_Group( $group_id );
-
         if ( !$group->delete() )
                 return false;
 
-        /* Delete all group activity from activity streams */
-        if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+        // Delete all group activity from activity streams
+        if ( bp_is_active( 'activity' ) )
                 bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component' => $bp->groups->id ) );
-        }
 
         // Remove all outstanding invites for this group
         groups_delete_all_group_invites( $group_id );
@@ -1644 +1651 @@
         // Remove all notifications for any user belonging to this group
         bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->slug );
 
-        do_action( 'groups_delete_group', $group_id );
+        // Remove forum
+        if ( $forum_id ) {
+                do_action( 'bbpress_init' );
+                bb_delete_forum( $forum_id );
+        }
 
+        do_action( 'groups_delete_group', $group_id, $forum_id );
+
         return true;
 }