Changeset 5871

Timestamp:

03/03/2012 09:40:53 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Decouple group-forum delete from group delete function. See #3598.

Location:

trunk

Files:

• bp-forums/bp-forums-functions.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)

trunk/bp-forums/bp-forums-functions.php

@@ -68 +68 @@
         return bb_update_forum( array( 'forum_id' => (int) $forum_id, 'forum_name' => stripslashes( $forum_name ), 'forum_desc' => stripslashes( $forum_desc ), 'forum_slug' => stripslashes( $forum_slug ), 'forum_parent' => $forum_parent_id, 'forum_order' => $forum_order, 'forum_is_category' => $forum_is_category ) );
 }
+
+function bp_forums_delete_group_forum( $group_id ) {
+        $forum_id = groups_get_groupmeta( $group_id, 'forum_id' );
+
+        if ( !empty( $forum_id ) && is_int( $forum_id ) ) {
+                do_action( 'bbpress_init' );
+                bb_delete_forum( $forum_id );
+        }
+}
+add_action( 'groups_delete_group', 'bp_forums_delete_group_forum' );
 
 /** Topic Functions ***********************************************************/

trunk/bp-groups/bp-groups-functions.php

@@ -222 +222 @@
         bp_core_delete_all_notifications_by_type( $group_id, $bp->groups->id );
 
-        // Remove forum if component is active and current group has one
-        if ( bp_is_active( 'forums' ) && $forum_id = groups_get_groupmeta( $group_id, 'forum_id' ) ) {
-                do_action( 'bbpress_init' );
-                bb_delete_forum( $forum_id );
-        }
-
         do_action( 'groups_delete_group', $group_id);