Skip to:
Content

BuddyPress.org

Changeset 8056


Ignore:
Timestamp:
03/06/2014 01:40:03 AM (10 years ago)
Author:
r-a-y
Message:

Groups: When fetching a new group object, default 'populate_extras' to false.

In r7934, the 'populate_extras' parameter was set to true. This
parameter queries additional info about the group including group
admins, moderators and member status.

There are very few instances where we need this extra information. We
only need this data when on a single group or in a group loop.

Therefore, this commit sets the 'populate_extras' parameter to false
by default and sets it to true when setting up the current group
object.

Fixes #5411

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups/bp-groups-classes.php

    r8044 r8056  
    162162    public function __construct( $id = null, $args = array() ) {
    163163        $this->args = wp_parse_args( $args, array(
    164             'populate_extras' => true,
     164            'populate_extras' => false,
    165165        ) );
    166166
  • trunk/bp-groups/bp-groups-functions.php

    r7956 r8056  
    4444        'group_id'          => false,
    4545        'load_users'        => false,
    46         'populate_extras'   => true,
     46        'populate_extras'   => false,
    4747    ) );
    4848
  • trunk/bp-groups/bp-groups-loader.php

    r7966 r8056  
    163163            $bp->is_single_item  = true;
    164164            $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
    165             $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
     165
     166            if ( $current_group_class == 'BP_Groups_Group' ) {
     167                $this->current_group = groups_get_group( array(
     168                    'group_id'        => $group_id,
     169                    'populate_extras' => true,
     170                ) );
     171
     172            } else {
     173                $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
     174            }
    166175
    167176            // When in a single group, the first action is bumped down one because of the
  • trunk/tests/testcases/groups/functions.php

    r7956 r8056  
    563563        $this->set_current_user( $u1 );
    564564
    565         $group1 = groups_get_group( array( 'group_id' => $g, ) );
     565        $group1 = groups_get_group( array( 'group_id' => $g, 'populate_extras' => true ) );
    566566
    567567        $this->set_current_user( $u2 );
    568568
    569         $group2 = groups_get_group( array( 'group_id' => $g, ) );
     569        $group2 = groups_get_group( array( 'group_id' => $g, 'populate_extras' => true ) );
    570570
    571571        $this->assertNotEquals( $group1, $group2 );
Note: See TracChangeset for help on using the changeset viewer.