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

Timestamp:

06/10/2009 08:49:07 PM (17 years ago)

Author:

apeatling

Message:

Fixing bug where pagination links would break when the max value was more than the total number of items being returned.

File:

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

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

@@ -468 +468 @@
             $this->group_count = 1;
         } else {
-            if ( !$max )
+            if ( !$max || $max >= (int)$this->groups['total'] )
                 $this->total_group_count = (int)$this->groups['total'];
             else
@@ -1642 +1642 @@
         $this->members = BP_Groups_Member::get_all_for_group( $group_id, $this->pag_num, $this->pag_page, $exclude_admins_mods, $exclude_banned );
         
-        if ( !$max )
+        if ( !$max || $max >= (int)$this->members['count'] )
             $this->total_member_count = (int)$this->members['count'];
         else
@@ -1918 +1918 @@
         }
         
-        if ( !$max )
+        if ( !$max || $max >= (int)$this->groups['total'] )
             $this->total_group_count = (int)$this->groups['total'];
         else
@@ -2223 +2223 @@
         $this->requests = BP_Groups_Group::get_membership_requests( $group_id, $this->pag_num, $this->pag_page );       
 
-        if ( !$max )
+        if ( !$max || $max >= (int)$this->requests['total'] )
             $this->total_request_count = (int)$this->requests['total'];
         else