Changeset 11740

Timestamp:

11/03/2017 09:17:04 PM (7 years ago)

Author:

boonebgorges

Message:

Better parsing of params passed to groups_create_group().

This changeset rewrites the logic of the way default values are parsed,
so that values aren't inadvertently reset when updating an existing
group via groups_create_group().

Props dcavins.
Fixes #7619.

File:

• trunk/src/bp-groups/bp-groups-functions.php (modified) (3 diffs)

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

@@ -105 +105 @@
         'description'  => '',
         'slug'         => '',
-        'status'       => 'public',
-        'parent_id'    => 0,
-        'enable_forum' => 0,
-        'date_created' => bp_core_current_time()
+        'status'       => null,
+        'parent_id'    => null,
+        'enable_forum' => null,
+        'date_created' => null
     );
 
@@ -121 +121 @@
         $creator_id  = ! empty( $creator_id ) ? $creator_id : $group->creator_id;
         $description = ! empty( $description ) ? $description : $group->description;
+        $status = ! is_null( $status ) ? $status : $group->status;
+        $parent_id = ! is_null( $parent_id ) ? $parent_id : $group->parent_id;
+        $enable_forum = ! is_null( $enable_forum ) ? $enable_forum : $group->enable_forum;
+        $date_created = ! is_null( $date_created ) ? $date_created : $group->date_created;
 
         // Groups need at least a name.
@@ -131 +135 @@
         // Instantiate new group object.
         $group = new BP_Groups_Group;
+
+        // Check for null values, reset to sensible defaults.
+        $status = ! is_null( $status ) ? $status : 'public';
+        $parent_id = ! is_null( $parent_id ) ? $parent_id : 0;
+        $enable_forum = ! is_null( $enable_forum ) ? $enable_forum : 0;
+        $date_created = ! is_null( $date_created ) ? $date_created : bp_core_current_time();
     }