Changeset 8056

Timestamp:

03/06/2014 01:40:03 AM (11 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:

• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• tests/testcases/groups/functions.php (modified) (1 diff)

trunk/bp-groups/bp-groups-classes.php

@@ -162 +162 @@
     public function __construct( $id = null, $args = array() ) {
         $this->args = wp_parse_args( $args, array(
-            'populate_extras' => true,
+            'populate_extras' => false,
         ) );
 

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

@@ -44 +44 @@
         'group_id'          => false,
         'load_users'        => false,
-        'populate_extras'   => true,
+        'populate_extras'   => false,
     ) );
 

trunk/bp-groups/bp-groups-loader.php

@@ -163 +163 @@
             $bp->is_single_item  = true;
             $current_group_class = apply_filters( 'bp_groups_current_group_class', 'BP_Groups_Group' );
-            $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
+
+            if ( $current_group_class == 'BP_Groups_Group' ) {
+                $this->current_group = groups_get_group( array(
+                    'group_id'        => $group_id,
+                    'populate_extras' => true,
+                ) );
+
+            } else {
+                $this->current_group = apply_filters( 'bp_groups_current_group_object', new $current_group_class( $group_id ) );
+            }
 
             // When in a single group, the first action is bumped down one because of the

trunk/tests/testcases/groups/functions.php

@@ -563 +563 @@
         $this->set_current_user( $u1 );
 
-        $group1 = groups_get_group( array( 'group_id' => $g, ) );
+        $group1 = groups_get_group( array( 'group_id' => $g, 'populate_extras' => true ) );
 
         $this->set_current_user( $u2 );
 
-        $group2 = groups_get_group( array( 'group_id' => $g, ) );
+        $group2 = groups_get_group( array( 'group_id' => $g, 'populate_extras' => true ) );
 
         $this->assertNotEquals( $group1, $group2 );