Changeset 3230 for branches/1.2/bp-groups.php

Timestamp:

09/02/2010 06:32:45 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2613 props Paul Gibbs

File:

• branches/1.2/bp-groups.php (modified) (3 diffs)

branches/1.2/bp-groups.php

@@ -1621 +1621 @@
 }
 
+/**
+ * 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;
@@ -1630 +1637 @@
     // 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
@@ -1645 +1650 @@
     bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->slug );
 
-    do_action( 'groups_delete_group', $group_id );
+    // Remove forum if component is active and current group has one
+    if ( function_exists( 'bp_forums_setup' ) && $group->enable_forum ) {
+        do_action( 'bbpress_init' );
+        bb_delete_forum( groups_get_groupmeta( $group_id, 'forum_id' ) );
+    }
+
+    do_action( 'groups_delete_group', $group_id);
 
     return true;