Changeset 4613 for trunk/includes/extend/buddypress/group.php

Timestamp:

12/21/2012 07:13:50 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Introduce toggle_group_forum() method to handle saving of enable_forum group setting. Fixes issue with setting not being saved when creating a new group. Props boonebgorges. Fixes #2122.

File:

• trunk/includes/extend/buddypress/group.php (modified) (4 diffs)

trunk/includes/extend/buddypress/group.php

@@ -302 +302 @@
 
         // Update the group forum setting
-        $group               = new BP_Groups_Group( $group_id );
-        $group->enable_forum = $edit_forum;
-        $group->save();
+        $group = $this->toggle_group_forum( $group_id, $edit_forum );
 
         // Create a new forum
@@ -420 +418 @@
                 groups_update_groupmeta( bp_get_new_group_id(), '_bbp_forum_enabled_' . $forum_id, true );
 
+                // Toggle forum on
+                $this->toggle_group_forum( bp_get_new_group_id(), true );
+
                 break;
             case false :
@@ -425 +426 @@
                 // Forum was created but is now being undone
                 if ( !empty( $forum_id ) ) {
+
+                    // Delete the forum
                     wp_delete_post( $forum_id, true );
+
+                    // Delete meta values
                     groups_delete_groupmeta( bp_get_new_group_id(), 'forum_id' );
                     groups_delete_groupmeta( bp_get_new_group_id(), '_bbp_forum_enabled_' . $forum_id );
+
+                    // Toggle forum off
+                    $this->toggle_group_forum( bp_get_new_group_id(), false );
                 }
 
@@ -496 +504 @@
         bbp_remove_forum_id_from_group( $group_id, $forum_id );
         bbp_remove_group_id_from_forum( $forum_id, $group_id );
+    }
+
+    /**
+     * Toggle the enable_forum group setting on or off
+     *
+     * @since bbPress (r4612)
+     *
+     * @param int $group_id The group to toggle
+     * @param bool $enabled True for on, false for off
+     * @uses groups_get_group() To get the group to toggle
+     * @return False if group is not found, otherwise return the group
+     */
+    public function toggle_group_forum( $group_id = 0, $enabled = false ) {
+
+        // Get the group
+        $group = groups_get_group( array( 'group_id' => $group_id ) );
+
+        // Bail if group cannot be found
+        if ( empty( $group ) )
+            return false;
+
+        // Set forum enabled status
+        $group->enable_forum = (int) $enabled;
+
+        // Save the group
+        $group->save();
+
+        // Return the group
+        return $group;
     }