Changeset 8168

Timestamp:

03/26/2014 11:35:32 PM (11 years ago)

Author:

r-a-y

Message:

Groups: Add backward compatibility when fetching list of admins/mods.

In r8056, the change was made so a group does not fetch its extra data
like grabbing the list of group admins and mods by default.

However, if a group template loop was created with the 'populate_extras'
parameter set to false and either the bp_group_list_admins() and
bp_group_list_mods() functions were used in the loop, these functions
would not output the correct list.

To solve this, this commit manually fetches the group admins / mods if
the 'populate_extras' flag in the group template loop is set to false.

Fixes #5411

Location:

trunk/bp-groups

Files:

• bp-groups-classes.php (modified) (1 diff)
• bp-groups-template.php (modified) (2 diffs)

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

@@ -152 +152 @@
      * @var array
      */
-    protected $args;
+    public $args;
 
     /**

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

@@ -777 +777 @@
     global $groups_template;
 
-    if ( empty( $group ) )
+    if ( empty( $group ) ) {
         $group =& $groups_template->group;
-
-    if ( !empty( $group->admins ) ) { ?>
+    }
+
+    // fetch group admins if 'populate_extras' flag is false
+    if ( empty( $group->args['populate_extras'] ) ) {
+        $query = new BP_Group_Member_Query( array(
+            'group_id'   => $group->id,
+            'group_role' => 'admin',
+            'type'       => 'first_joined',
+        ) );
+
+        if ( ! empty( $query->results ) ) {
+            $group->admins = $query->results;
+        }
+    }
+
+    if ( ! empty( $group->admins ) ) { ?>
         <ul id="group-admins">
             <?php foreach( (array) $group->admins as $admin ) { ?>
@@ -797 +811 @@
     global $groups_template;
 
-    if ( empty( $group ) )
+    if ( empty( $group ) ) {
         $group =& $groups_template->group;
-
-    if ( !empty( $group->mods ) ) : ?>
+    }
+
+    // fetch group mods if 'populate_extras' flag is false
+    if ( empty( $group->args['populate_extras'] ) ) {
+        $query = new BP_Group_Member_Query( array(
+            'group_id'   => $group->id,
+            'group_role' => 'mod',
+            'type'       => 'first_joined',
+        ) );
+
+        if ( ! empty( $query->results ) ) {
+            $group->mods = $query->results;
+        }
+    }
+
+    if ( ! empty( $group->mods ) ) : ?>
 
         <ul id="group-mods">