Changeset 6300

Timestamp:

02/21/2017 11:25:09 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Pagination: prefer intval() for numeric values, and always format numbers used for display.

Location:

trunk/src/includes

Files:

• replies/template.php (modified) (3 diffs)
• search/template.php (modified) (1 diff)

trunk/src/includes/replies/template.php

@@ -2457 +2457 @@
 
         // Set pagination values
-        $start_num = intval( ( $bbp->reply_query->paged - 1 ) * $bbp->reply_query->posts_per_page ) + 1;
-        $from_num  = bbp_number_format( $start_num );
-        $to_num    = bbp_number_format( ( $start_num + ( $bbp->reply_query->posts_per_page - 1 ) > $bbp->reply_query->found_posts ) ? $bbp->reply_query->found_posts : $start_num + ( $bbp->reply_query->posts_per_page - 1 ) );
-        $total_int = (int) $bbp->reply_query->found_posts;
-        $total     = bbp_number_format( $total_int );
+        $total_int = intval( $bbp->reply_query->found_posts    );
+        $ppp_int   = intval( $bbp->reply_query->posts_per_page );
+        $start_int = intval( ( $bbp->reply_query->paged - 1 ) * $ppp_int ) + 1;
+        $to_int    = intval( ( $start_int + ( $ppp_int - 1 ) > $total_int )
+                ? $total_int
+                : $start_int + ( $ppp_int - 1 ) );
+
+        // Format numbers for display
+        $total_num = bbp_number_format( $total_int );
+        $from_num  = bbp_number_format( $start_int );
+        $to_num    = bbp_number_format( $to_int    );
 
         // We are threading replies
@@ -2474 +2480 @@
             // Several replies in a topic with a single page
             if ( empty( $to_num ) ) {
-                $retstr = sprintf( _n( 'Viewing %1$s reply', 'Viewing %1$s replies', $total_int, 'bbpress' ), $total );
+                $retstr = sprintf( _n( 'Viewing %1$s reply', 'Viewing %1$s replies', $total_int, 'bbpress' ), $total_num );
 
             // Several replies in a topic with several pages
             } else {
-                $retstr = sprintf( _n( 'Viewing %2$s replies (of %4$s total)', 'Viewing %1$s replies - %2$s through %3$s (of %4$s total)', $bbp->reply_query->post_count, 'bbpress' ), $bbp->reply_query->post_count, $from_num, $to_num, $total );
+                $retstr = sprintf( _n( 'Viewing %2$s replies (of %4$s total)', 'Viewing %1$s replies - %2$s through %3$s (of %4$s total)', $bbp->reply_query->post_count, 'bbpress' ), $bbp->reply_query->post_count, $from_num, $to_num, $total_num );
             }
 
@@ -2486 +2492 @@
             // Several posts in a topic with a single page
             if ( empty( $to_num ) ) {
-                $retstr = sprintf( _n( 'Viewing %1$s post', 'Viewing %1$s posts', $total_int, 'bbpress' ), $total );
+                $retstr = sprintf( _n( 'Viewing %1$s post', 'Viewing %1$s posts', $total_int, 'bbpress' ), $total_num );
 
             // Several posts in a topic with several pages
             } else {
-                $retstr = sprintf( _n( 'Viewing %2$s post (of %4$s total)', 'Viewing %1$s posts - %2$s through %3$s (of %4$s total)', $bbp->reply_query->post_count, 'bbpress' ), $bbp->reply_query->post_count, $from_num, $to_num, $total );
+                $retstr = sprintf( _n( 'Viewing %2$s post (of %4$s total)', 'Viewing %1$s posts - %2$s through %3$s (of %4$s total)', $bbp->reply_query->post_count, 'bbpress' ), $bbp->reply_query->post_count, $from_num, $to_num, $total_num );
             }
         }

trunk/src/includes/search/template.php

@@ -402 +402 @@
 
         // Set pagination values
-        $start_num = intval( ( $bbp->search_query->paged - 1 ) * $bbp->search_query->posts_per_page ) + 1;
-        $from_num  = bbp_number_format( $start_num );
-        $to_num    = bbp_number_format( ( $start_num + ( $bbp->search_query->posts_per_page - 1 ) > $bbp->search_query->found_posts ) ? $bbp->search_query->found_posts : $start_num + ( $bbp->search_query->posts_per_page - 1 ) );
-        $total_int = (int) $bbp->search_query->found_posts;
-        $total     = bbp_number_format( $total_int );
+        $total_int = intval( $bbp->search_query->found_posts    );
+        $ppp_int   = intval( $bbp->search_query->posts_per_page );
+        $start_int = intval( ( $bbp->search_query->paged - 1 ) * $ppp_int ) + 1;
+        $to_int    = intval( ( $start_int + ( $ppp_int - 1 ) > $total_int )
+                ? $total_int
+                : $start_int + ( $ppp_int - 1 ) );
+
+        // Format numbers for display
+        $total_num = bbp_number_format( $total_int );
+        $from_num  = bbp_number_format( $start_int );
+        $to_num    = bbp_number_format( $to_int    );
 
         // Single page of results
         if ( empty( $to_num ) ) {
-            $retstr = sprintf( _n( 'Viewing %1$s result', 'Viewing %1$s results', $total_int, 'bbpress' ), $total );
+            $retstr = sprintf( _n( 'Viewing %1$s result', 'Viewing %1$s results', $total_int, 'bbpress' ), $total_num );
 
         // Several pages of results
         } else {
-            $retstr = sprintf( _n( 'Viewing %2$s results (of %4$s total)', 'Viewing %1$s results - %2$s through %3$s (of %4$s total)', $bbp->search_query->post_count, 'bbpress' ), $bbp->search_query->post_count, $from_num, $to_num, $total );
-
+            $retstr = sprintf( _n( 'Viewing %2$s results (of %4$s total)', 'Viewing %1$s results - %2$s through %3$s (of %4$s total)', $bbp->search_query->post_count, 'bbpress' ), $bbp->search_query->post_count, $from_num, $to_num, $total_num );
         }