Changeset 2975 for branches/1.2/bp-groups/bp-groups-templatetags.php

Timestamp:

04/29/2010 03:50:17 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2251

File:

• branches/1.2/bp-groups/bp-groups-templatetags.php (modified) (2 diffs)

branches/1.2/bp-groups/bp-groups-templatetags.php

@@ -552 +552 @@
     global $bp, $groups_template;
 
-    $from_num = bp_core_number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
-    $to_num = bp_core_number_format( ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1 ) );
+    $start_num = intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1;
+    $from_num = bp_core_number_format( $start_num );
+    $to_num = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
     $total = bp_core_number_format( $groups_template->total_group_count );
 
-    echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
+    echo sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
     <span class="ajax-loader"></span><?php
 }
@@ -1404 +1405 @@
         global $members_template;
 
-        $from_num = bp_core_number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
-        $to_num = bp_core_number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1 ) );
+        $start_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
+        $from_num = bp_core_number_format( $start_num );
+        $to_num = bp_core_number_format( ( $start_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $start_num + ( $members_template->pag_num - 1 ) );
         $total = bp_core_number_format( $members_template->total_member_count );
 
-        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
+        return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total ) );
     }