Changeset 3540

Timestamp:

12/19/2010 11:10:20 AM (14 years ago)

Author:

djpaul

Message:

Revert part of r3537 to fix group admins/mods display. See #2661.

Location:

trunk

Files:

• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (4 diffs)

trunk/bp-groups.php

@@ -52 +52 @@
         /* This is a single group page. */
         $bp->is_single_item = true;
-        $bp->groups->current_group = groups_get_groups( array( 'type' => 'active', 'include' => $group_id ) );
-        $bp->groups->current_group = $bp->groups->current_group['groups'][0];
+        $bp->groups->current_group = new BP_Groups_Group( $group_id );
 
         /* Using "item" not "group" for generic support in other components. */

trunk/bp-groups/bp-groups-templatetags.php

@@ -32 +32 @@
             $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page, $exclude );
         } else if ( 'single-group' == $type ) {
-            $this->groups = array( $bp->groups->current_group );
+            $group           = new stdClass;
+            $group->group_id = BP_Groups_Group::get_id_from_slug( $slug );
+            $this->groups    = array( $group );
         } else {
             $this->groups = groups_get_groups( array( 'type' => $type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'include' => $include, 'exclude' => $exclude, 'populate_extras' => $populate_extras ) );
@@ -118 +120 @@
         $this->in_the_loop = true;
         $this->group = $this->next_group();
+
+        if ( $this->single_group )
+            $this->group = new BP_Groups_Group( $this->group->group_id );
 
         if ( 0 == $this->current_group ) // loop has just started
@@ -1018 +1023 @@
  * Checks if a user is banned from a group.
  *
+ * If this function is invoked inside the groups template loop (e.g. the group directory), then
+ * $groups_template->group->is_banned is set if the user is banned, so use that instead of making
+ * another SQL query.
+ *
  * @global object $bp BuddyPress global settings
  * @global BP_Groups_Template $groups_template Group template loop object
@@ -1035 +1044 @@
         $group =& $groups_template->group;
 
-        if ( !$user_id )
-            return apply_filters( 'bp_group_is_member_banned', !empty( $group->is_banned ) );
+        if ( !$user_id && !empty( $group->is_banned ) )
+            return apply_filters( 'bp_group_is_member_banned', true );
     }