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

Timestamp:

01/10/2018 12:49:30 PM (8 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-template.php (modified) (12 diffs)

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

@@ -922 +922 @@
         }
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
             'relative' => true,
-        ) );
+        ), 'group_last_active' );
 
         $last_active = $group->last_activity;
@@ -1350 +1350 @@
         global $groups_template;
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
             'relative' => true,
-        ) );
+        ), 'group_date_created' );
 
         if ( empty( $group ) ) {
@@ -1558 +1558 @@
         }
 
-        $defaults = array(
+        $r = bp_parse_args( $args, array(
             'type'   => 'full',
             'width'  => false,
@@ -1565 +1565 @@
             'id'     => false,
             'alt'    => sprintf( __( 'Group creator profile photo of %s', 'buddypress' ),  bp_core_get_user_displayname( $group->creator_id ) )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ), 'group_creator_avatar' );
         extract( $r, EXTR_SKIP );
 
@@ -2445 +2443 @@
         global $members_template, $groups_template;
 
-        $defaults = array(
+        $r = bp_parse_args( $args, array(
             'user_id' => $members_template->member->user_id,
             'group'   => &$groups_template->group
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ), 'group_member_promote_mod_link' );
         extract( $r, EXTR_SKIP );
 
@@ -2488 +2484 @@
         global $members_template, $groups_template;
 
-        $defaults = array(
+        $r = bp_parse_args( $args, array(
             'user_id' => !empty( $members_template->member->user_id ) ? $members_template->member->user_id : false,
             'group'   => &$groups_template->group
-        );
-
-        $r = wp_parse_args( $args, $defaults );
+        ), 'group_member_promote_admin_link' );
         extract( $r, EXTR_SKIP );
 
@@ -3697 +3691 @@
     }
 
-    $r = wp_parse_args( $args, array(
+    $r = bp_parse_args( $args, array(
         'group_id'            => bp_get_current_group_id(),
         'page'                => 1,
@@ -3708 +3702 @@
         'search_terms'        => $search_terms_default,
         'type'                => 'last_joined',
-    ) );
+    ), 'group_has_members' );
 
     /*
@@ -4083 +4077 @@
         global $members_template;
 
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
             'relative' => true,
-        ) );
+        ), 'group_member_joined_since' );
 
         // We do not want relative time, so return now.
@@ -5022 +5016 @@
 
         // Parse arguments.
-        $r = wp_parse_args( $args, array(
+        $r = bp_parse_args( $args, array(
             'user_id'   => bp_loggedin_user_id(),
             'group_id'  => false,
             'separator' => 'li'
-        ) );
+        ), 'group_invite_friend_list' );
 
         // No group passed, so look for new or current group ID's.
@@ -5374 +5368 @@
     global $requests_template;
 
-    $defaults = array(
+    $r = bp_parse_args( $args, array(
         'group_id' => bp_get_current_group_id(),
         'per_page' => 10,
         'page'     => 1,
         'max'      => false
-    );
-
-    $r = wp_parse_args( $args, $defaults );
+    ), 'group_has_membership_requests' );
 
     $requests_template = new BP_Groups_Membership_Requests_Template( $r );
@@ -5623 +5615 @@
     global $invites_template, $group_id;
 
-    $r = wp_parse_args( $args, array(
+    $r = bp_parse_args( $args, array(
         'group_id' => false,
         'user_id'  => bp_loggedin_user_id(),
         'per_page' => false,
         'page'     => 1,
-    ) );
+    ), 'group_has_invites' );
 
     if ( empty( $r['group_id'] ) ) {