Changeset 2666

Timestamp:

11/29/2010 12:44:16 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix previous topic pagination adjustments for author favorites

File:

• branches/plugin/bbp-includes/bbp-template.php (modified) (3 diffs)

branches/plugin/bbp-includes/bbp-template.php

@@ -1065 +1065 @@
 
     // Only add pagination if query returned results
-    if ( (int)$bbp_topics_template->post_count && (int)$bbp_topics_template->posts_per_page ) {
+    if ( ( (int)$bbp_topics_template->post_count || (int)$bbp_topics_template->found_posts ) && (int)$bbp_topics_template->posts_per_page ) {
 
         // If pretty permalinks are enabled, make our pagination pretty
@@ -1077 +1077 @@
             'base'      => $base,
             'format'    => '',
-            'total'     => $posts_per_page == $bbp_topics_template->post_count ? 1 : ceil( (int)$bbp_topics_template->found_posts / (int)$posts_per_page ),
+            'total'     => $posts_per_page == $bbp_topics_template->found_posts ? 1 : ceil( (int)$bbp_topics_template->found_posts / (int)$posts_per_page ),
             'current'   => (int)$bbp_topics_template->paged,
             'prev_text' => '←',
@@ -1994 +1994 @@
         $from_num  = bbp_number_format( $start_num );
         $to_num    = bbp_number_format( ( $start_num + ( $bbp_topics_template->posts_per_page - 1 ) > $bbp_topics_template->found_posts ) ? $bbp_topics_template->found_posts : $start_num + ( $bbp_topics_template->posts_per_page - 1 ) );
-        $total     = bbp_number_format( $bbp_topics_template->post_count );
+        $total     = bbp_number_format( !empty( $bbp_topics_template->found_posts ) ? $bbp_topics_template->found_posts : $bbp_topics_template->post_count );
 
         // Set return string