Changeset 1582 for branches/1.0/bp-activity/bp-activity-templatetags.php

Timestamp:

06/24/2009 07:58:56 PM (15 years ago)

Author:

apeatling

Message:

Merging more fixes incorrectly performed on trunk back into 1.0 branch.

File:

• branches/1.0/bp-activity/bp-activity-templatetags.php (modified) (1 diff)

branches/1.0/bp-activity/bp-activity-templatetags.php

@@ -34 +34 @@
             $this->activities = bp_activity_get_friends_activity( $user_id, $timeframe, $this->pag_num, $this->pag_page );
         
-        if ( !$max )
+        if ( !$max || $max >= (int)$this->activities['total'] )
             $this->total_activity_count = (int)$this->activities['total'];
         else