Changeset 11805 for trunk/src/bp-groups/bp-groups-functions.php

Timestamp:

01/10/2018 12:49:30 PM (7 years ago)

Author:

djpaul

Message:

Groups: use bp_parse_args() in low-level parts of the codebase.

These replace calls to wp_parse_args(). Our version supports a before/after filter, giving flexibility to third-party developers.

Fixes #7529

Props dcavins, espellcaste.

File:

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

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

@@ -49 +49 @@
      */
     if ( ! is_numeric( $group_id ) ) {
-        $r = wp_parse_args( $group_id, array(
+        $r = bp_parse_args( $group_id, array(
             'group_id'        => false,
             'load_users'      => false,
             'populate_extras' => false,
-        ) );
+        ), 'groups_get_group' );
 
         $group_id = $r['group_id'];
@@ -98 +98 @@
 function groups_create_group( $args = '' ) {
 
-    $defaults = array(
+    $args = bp_parse_args( $args, array(
         'group_id'     => 0,
         'creator_id'   => 0,
@@ -108 +108 @@
         'enable_forum' => null,
         'date_created' => null
-    );
-
-    $args = wp_parse_args( $args, $defaults );
+    ), 'groups_create_group' );
+
     extract( $args, EXTR_SKIP );
 
@@ -256 +255 @@
     }
 
-    $r = wp_parse_args( $args, array(
+    $r = bp_parse_args( $args, array(
         'group_id'       => bp_get_current_group_id(),
         'name'           => null,
@@ -262 +261 @@
         'description'    => null,
         'notify_members' => false,
-    ) );
+    ), 'groups_edit_base_group_details' );
 
     if ( ! $r['group_id'] ) {
@@ -682 +681 @@
     }
 
-    $r = wp_parse_args( $args, array(
+    $r = bp_parse_args( $args, array(
         'group_id'            => bp_get_current_group_id(),
         'per_page'            => false,
@@ -692 +691 @@
         'search_terms'        => false,
         'type'                => 'last_joined',
-    ) );
+    ), 'groups_get_group_members' );
 
     // For legacy users. Use of BP_Groups_Member::get_all_for_group() is deprecated.
@@ -1266 +1265 @@
     $bp = buddypress();
 
-    $defaults = array(
+    $r = bp_parse_args( $args, array(
         'content'    => false,
         'user_id'    => bp_loggedin_user_id(),
         'group_id'   => 0,
         'error_type' => 'bool'
-    );
-
-    $r = wp_parse_args( $args, $defaults );
+    ), 'groups_post_update' );
     extract( $r, EXTR_SKIP );
 
@@ -1395 +1392 @@
 function groups_invite_user( $args = '' ) {
 
-    $defaults = array(
+    $args = bp_parse_args( $args, array(
         'user_id'       => false,
         'group_id'      => false,
@@ -1401 +1398 @@
         'date_modified' => bp_core_current_time(),
         'is_confirmed'  => 0
-    );
-
-    $args = wp_parse_args( $args, $defaults );
+    ), 'groups_invite_user' );
     extract( $args, EXTR_SKIP );