Changeset 957

Timestamp:

01/29/2009 03:03:48 AM (18 years ago)

Author:

apeatling

Message:

Removing forum code duplication.

File:

• trunk/bp-groups.php (modified) (2 diffs)

trunk/bp-groups.php

@@ -1492 +1492 @@
 }
 
-function groups_new_group_forum() {
+function groups_new_group_forum( $group_id = false, $group_name = false, $group_desc = false ) {
         global $group_obj;
         
-        $forum = bp_forums_new_forum( apply_filters( 'groups_new_group_forum_name', $group_obj->name . ' - Forum', $group_obj->name ), apply_filters( 'groups_new_group_forum_desc', $group_obj->description ) );
-        
-        groups_update_groupmeta( $group_obj->id, 'forum_id', $forum['forum_id'] );
-        
-        do_action( 'groups_new_group_forum', $forum, $group_obj->id );
+        if ( !$group_id )
+                $group_id = $group_obj->id;
+        
+        if ( !$group_name )
+                $group_name = $group_obj->name;
+        
+        if ( !$group_desc )
+                $group_desc = $group_obj->description;
+        
+        $forum = bp_forums_new_forum( apply_filters( 'groups_new_group_forum_name', $group_name . ' - Forum', $group_name ), apply_filters( 'groups_new_group_forum_desc', $group_desc ) );
+        
+        groups_update_groupmeta( $group_id, 'forum_id', $forum['forum_id'] );
+        
+        do_action( 'groups_new_group_forum', $forum, $group_id );
 }
 
@@ -1772 +1781 @@
         if ( $group->enable_forum ) {
                 if ( function_exists( 'bp_forums_setup' ) && groups_get_groupmeta( $group->id, 'forum_id' ) == '' ) {
-                        $forum = bp_forums_new_forum( $group->name . ' - Forum ', $group->description );
-                        groups_update_groupmeta( $group->id, 'forum_id', $forum['forum_id'] );
+                        groups_new_group_forum( $group->id, $group->name, $group->description );
                 }
         }