Changeset 12381

Timestamp:

04/25/2019 02:42:31 PM (6 years ago)

Author:

boonebgorges

Message:

Groups: Improved group detection when updating settings.

Location:

trunk/src/bp-groups/screens/single/admin

Files:

• edit-details.php (modified) (1 diff)
• group-settings.php (modified) (4 diffs)

trunk/src/bp-groups/screens/single/admin/edit-details.php

@@ -34 +34 @@
                 bp_core_add_message( __( 'Groups must have a name and a description. Please try again.', 'buddypress' ), 'error' );
             } elseif ( ! groups_edit_base_group_details( array(
-                'group_id'       => $_POST['group-id'],
+                'group_id'       => bp_get_current_group_id(),
                 'name'           => $_POST['group-name'],
                 'slug'           => null, // @TODO: Add to settings pane? If yes, editable by site admin only, or allow group admins to do this?

trunk/src/bp-groups/screens/single/admin/group-settings.php

@@ -41 +41 @@
             return false;
 
+        $group_id = bp_get_current_group_id();
+
         /*
          * Save group types.
@@ -46 +48 @@
          * Ensure we keep types that have 'show_in_create_screen' set to false.
          */
-        $current_types = bp_groups_get_group_type( bp_get_current_group_id(), false );
+        $current_types = bp_groups_get_group_type( $group_id, false );
         $current_types = array_intersect( bp_groups_get_group_types( array( 'show_in_create_screen' => false ) ), (array) $current_types );
         if ( isset( $_POST['group-types'] ) ) {
@@ -52 +54 @@
 
             // Set group types.
-            bp_groups_set_group_type( bp_get_current_group_id(), $current_types );
+            bp_groups_set_group_type( $group_id, $current_types );
 
         // No group types checked, so this means we want to wipe out all group types.
@@ -64 +66 @@
 
             // Set group types.
-            bp_groups_set_group_type( bp_get_current_group_id(), $current_types );
+            bp_groups_set_group_type( $group_id, $current_types );
         }
 
-        if ( !groups_edit_group_settings( $_POST['group-id'], $enable_forum, $status, $invite_status ) ) {
+        if ( ! groups_edit_group_settings( $group_id, $enable_forum, $status, $invite_status ) ) {
             bp_core_add_message( __( 'There was an error updating group settings. Please try again.', 'buddypress' ), 'error' );
         } else {