Changeset 1538 for trunk/bp-forums/bp-forums-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-forums/bp-forums-templatetags.php (modified) (2 diffs)

trunk/bp-forums/bp-forums-templatetags.php

@@ -31 +31 @@
             $this->total_topic_count = 0;
         } else {
-            if ( !$max )
-                $this->total_topic_count = count( bp_forums_get_topics( $forum_id ) );
+            $forum_count = count( bp_forums_get_topics( $forum_id ) );
+            
+            if ( !$max || $max >= $forum_count )
+                $this->total_topic_count = $forum_count;
             else
                 $this->total_topic_count = (int)$max;
@@ -395 +397 @@
             $this->total_post_count = 0;
         } else {
-            if ( !$max )
+            if ( !$max || $max >= (int) $forum_template->topic->topic_posts )
                 $this->total_post_count = (int) $forum_template->topic->topic_posts;
             else