Changeset 570

Timestamp:

11/21/2008 10:50:45 PM (17 years ago)

Author:

apeatling

Message:

Fixed problem with no groups showing in group admin screen.

Location:

trunk/bp-groups

Files:

• bp-groups-admin.php (modified) (2 diffs)
• bp-groups-templatetags.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-admin.php

@@ -37 +37 @@
             <input id="post-query-submit" class="button" type="submit" value="Search Groups"/>
         </form>
-    
+        
         <?php if ( bp_has_groups('15') ) : ?>
             <form id="bp-group-admin-list" method="post" action="<?php $_SERVER['PHP_SELF'] ?>">
@@ -139 +139 @@
             <?php else: ?>
 
-                <?php if ( bp_group_show_no_groups_message() ) : ?>
                 <div id="message" class="info">
                     <p><?php _e( 'No groups to display', 'buddypress' ) ?></p>
                 </div>
-                <?php endif; ?>
 
             <?php endif;?>

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

@@ -22 +22 @@
         if ( !$user_id )
             $user_id = $current_user->id;
-
+        
         $this->pag_page = isset( $_REQUEST['fpage'] ) ? intval( $_REQUEST['fpage'] ) : 1;
         $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $groups_per_page;
         
-        if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] == '' ) || ( !$bp['current_action'] && $_REQUEST['group-filter-box'] == '' ) ) {
+        if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] == '' ) || ( !$bp['current_action'] && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] == '' ) ) {
             
             $this->groups = groups_get_user_groups( $this->pag_num, $this->pag_page );
@@ -33 +33 @@
             $this->group_count = count($this->groups);
         
-        } else if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) || ( !$bp['current_action'] && $_REQUEST['group-filter-box'] != '' ) ) {
+        } else if ( ( $bp['current_action'] == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) || ( !$bp['current_action'] && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
 
             $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
@@ -76 +76 @@
         
         }
-
+        
         $this->pag_links = paginate_links( array(
             'base' => add_query_arg( array( 'fpage' => '%#%', 'num' => $this->pag_num, 's' => $_REQUEST['s'], 'sortby' => $this->sort_by, 'order' => $this->order ) ),