Changeset 2622 for trunk/bp-groups/bp-groups-templatetags.php

Timestamp:

02/08/2010 12:33:13 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1840

File:

• trunk/bp-groups/bp-groups-templatetags.php (modified) (7 diffs)

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

@@ -23 +23 @@
     var $order;
 
-    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms ) {
+    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras ) {
         global $bp;
 
@@ -31 +31 @@
         switch ( $type ) {
             case 'active': default:
-                $this->groups = groups_get_active( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_active( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'alphabetical': default:
-                $this->groups = groups_get_alphabetically( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_alphabetically( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'random':
-                $this->groups = groups_get_random_groups( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_random_groups( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'newest':
-                $this->groups = groups_get_newest( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_newest( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'popular':
-                $this->groups = groups_get_popular( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_popular( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'most-forum-topics':
-                $this->groups = groups_get_by_most_forum_topics( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_by_most_forum_topics( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
 
             case 'most-forum-posts':
-                $this->groups = groups_get_by_most_forum_posts( $this->pag_num, $this->pag_page, $user_id, $search_terms );
+                $this->groups = groups_get_by_most_forum_posts( $this->pag_num, $this->pag_page, $user_id, $search_terms, $populate_extras );
                 break;
+
+            case 'invites':
+                $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page );
+                break;
+
+            case 'single-group':
+                $group = new stdClass;
+                $group->group_id = BP_Groups_Group::get_id_from_slug($slug);
+                $this->groups = array( $group );
+                break;
+
 
             case 'admin-of':
@@ -66 +77 @@
                 if ( $user_id )
                     $this->groups = groups_get_user_is_mod_of( $user_id, $this->pag_num, $this->pag_page, $filter );
-                break;
-
-            case 'invites':
-                $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page );
-                break;
-
-            case 'single-group':
-                $group = new stdClass;
-                $group->group_id = BP_Groups_Group::get_id_from_slug($slug);
-                $this->groups = array( $group );
                 break;
         }
@@ -215 +216 @@
         'user_id' => $user_id, // Pass a user ID to limit to groups this user has joined
         'slug' => $slug, // Pass a group slug to only return that group
-        'search_terms' => $search_terms // Pass search terms to return only matching groups
+        'search_terms' => $search_terms, // Pass search terms to return only matching groups
+
+        'populate_extras' => true // Get extra meta - is_member, is_banned
     );
 
@@ -221 +224 @@
     extract( $r );
 
-    $groups_template = new BP_Groups_Template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms );
+    $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, (int)$populate_extras );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
 }
@@ -1135 +1138 @@
         return false;
 
+    if ( 'hidden' == $group->status && !$group->is_member )
+        return false;
+
     echo '<div class="generic-button group-button ' . $group->status . '" id="groupbutton-' . $group->id . '">';
 
@@ -1154 +1160 @@
                     echo '<a class="membership-requested" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
             }
+        break;
+
+        case 'hidden':
+            if ( $group->is_member )
+                echo '<a class="leave-group" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
         break;
     }