<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2198] trunk:
Applying number formatting to pagination and tabs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2198</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-18 10:20:35 +0000 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Applying number formatting to pagination and tabs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsbpforumsfiltersphp">trunk/bp-forums/bp-forums-filters.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpfriendsbpfriendstemplatetagsphp">trunk/bp-friends/bp-friends-templatetags.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfiltersphp">trunk/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatetagsphp">trunk/bp-groups/bp-groups-templatetags.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatetagsphp">trunk/bp-messages/bp-messages-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityindexphp">trunk/bp-themes/bp-default/activity/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultblogsindexphp">trunk/bp-themes/bp-default/blogs/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultforumsindexphp">trunk/bp-themes/bp-default/forums/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupsindexphp">trunk/bp-themes/bp-default/groups/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersindexphp">trunk/bp-themes/bp-default/members/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-activity/bp-activity-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> function bp_activity_pagination_count() {
</span><span class="cx"> global $bp, $activities_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1) ;
</del><ins>+ $from_num = number_format( intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1 );
+ $to_num = number_format( ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing item %d to %d (of %d items)', 'buddypress' ), $from_num, $to_num, $activities_template->total_activity_count ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span></span></pre></div>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> function bp_blogs_pagination_count() {
</span><span class="cx"> global $bp, $blogs_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) ;
</del><ins>+ $from_num = number_format( intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1 );
+ $to_num = number_format( ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $blogs_template->total_blog_count ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span><span class="lines">@@ -277,6 +277,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_total_blog_count() {
+ echo bp_get_total_blog_count();
+}
+ function bp_get_total_blog_count() {
+ return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
+ }
+
+function bp_total_blog_count_for_user( $user_id = false ) {
+ echo bp_get_total_blog_count_for_user( $user_id );
+}
+ function bp_get_total_blog_count_for_user( $user_id = false ) {
+ return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
+ }
+
</ins><span class="cx"> /***
</span><span class="cx"> * Technically the template loops for blog posts and comments are deprecated.
</span><span class="cx"> * Instead you should be using the activity stream template loop and filtering
</span><span class="lines">@@ -1170,17 +1184,4 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_total_blogs_for_user( $user_id = false ) {
- global $bp;
-
- if ( !$user_id )
- $user_id = $bp->displayed_user->id;
-
- return apply_filters( 'bp_total_blogs_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
-}
-
-function bp_get_total_blog_count() {
- return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
-}
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-core/bp-core-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -161,8 +161,8 @@
</span><span class="cx"> function bp_members_pagination_count() {
</span><span class="cx"> global $bp, $members_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) ;
</del><ins>+ $from_num = number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
+ $to_num = 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) );
</ins><span class="cx">
</span><span class="cx"> if ( 'active' == $members_template->type )
</span><span class="cx"> echo sprintf( __( 'Viewing member %d to %d (of %d active members)', 'buddypress' ), $from_num, $to_num, $members_template->total_member_count );
</span><span class="lines">@@ -1110,6 +1110,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_total_member_count() {
+ echo bp_get_total_member_count();
+}
+ function bp_get_total_member_count() {
+ return apply_filters( 'bp_get_total_member_count', bp_core_get_total_member_count() );
+ }
+ add_filter( 'bp_get_total_member_count', 'number_format' );
+
</ins><span class="cx"> /*** Signup form template tags **********************/
</span><span class="cx">
</span><span class="cx"> function bp_signup_username_value() {
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-core.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0" ) );
</span><del>- return apply_filters( 'bp_core_get_total_member_count', (int)$count );
</del><ins>+ return apply_filters( 'bp_core_get_total_member_count', $count );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-filters.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-filters.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-forums/bp-forums-filters.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_forum_topic_count_for_user', 'number_format' );
+add_filter( 'bp_get_forum_topic_count', 'number_format' );
+
</ins><span class="cx"> function bp_forums_add_allowed_tags( $allowedtags ) {
</span><span class="cx"> $allowedtags['p'] = array();
</span><span class="cx"> $allowedtags['br'] = array();
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-forums/bp-forums-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -641,8 +641,8 @@
</span><span class="cx"> function bp_forum_pagination_count() {
</span><span class="cx"> global $bp, $forum_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $forum_template->pag_num - 1 ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 );
</del><ins>+ $from_num = number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
+ $to_num = number_format( ( $from_num + ( $forum_template->pag_num - 1 ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ) );
</ins><span class="cx">
</span><span class="cx"> echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %d to %d (%d total topics)', 'buddypress' ), $from_num, $to_num, $forum_template->total_topic_count ) );
</span><span class="cx"> ?>
</span><span class="lines">@@ -1002,4 +1002,17 @@
</span><span class="cx"> return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . attribute_escape( $_SERVER['REQUEST_URI'] ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_forum_topic_count_for_user( $user_id = false ) {
+ echo bp_get_forum_topic_count_for_user( $user_id );
+}
+ function bp_get_forum_topic_count_for_user( $user_id = false ) {
+ return apply_filters( 'bp_get_forum_topic_count_for_user', bp_forums_total_topic_count_for_user( $user_id ) );
+ }
+
+function bp_forum_topic_count( $user_id = false ) {
+ echo bp_get_forum_topic_count( $user_id );
+}
+ function bp_get_forum_topic_count( $user_id = false ) {
+ return apply_filters( 'bp_get_forum_topic_count', bp_forums_total_topic_count( $user_id ) );
+ }
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-friends/bp-friends-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -192,4 +192,11 @@
</span><span class="cx"> return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_total_friend_count( $user_id = false ) {
+ echo bp_get_total_friend_count( $user_id );
+}
+ function bp_get_total_friend_count( $user_id = false ) {
+ return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ) );
+ }
+ add_filter( 'bp_get_total_friend_count', 'number_format' );
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-filters.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-filters.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-groups/bp-groups-filters.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> add_filter( 'groups_group_description_before_save', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'groups_group_news_before_save', 'force_balance_tags' );
</span><span class="cx">
</span><ins>+add_filter( 'bp_get_total_group_count', 'number_format' );
+add_filter( 'bp_get_group_total_for_member', 'number_format' );
+add_filter( 'bp_get_group_total_members', 'number_format' );
+
</ins><span class="cx"> /**** Filters for group forums ****/
</span><span class="cx">
</span><span class="cx"> function groups_add_forum_privacy_sql() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-groups/bp-groups-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -675,22 +675,13 @@
</span><span class="cx"> function bp_groups_pagination_count() {
</span><span class="cx"> global $bp, $groups_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1) ;
</del><ins>+ $from_num = number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
+ $to_num = 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 ) );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $groups_template->total_group_count ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_total_group_count() {
- echo bp_get_total_group_count();
-}
- function bp_get_total_group_count() {
- global $groups_template;
-
- return apply_filters( 'bp_get_total_group_count', $groups_template->total_group_count );
- }
-
</del><span class="cx"> function bp_group_total_members( $deprecated = true, $deprecated2 = false ) {
</span><span class="cx"> if ( !$deprecated )
</span><span class="cx"> return bp_get_group_total_members();
</span><span class="lines">@@ -713,9 +704,9 @@
</span><span class="cx"> global $groups_template;
</span><span class="cx">
</span><span class="cx"> if ( 1 == (int) $groups_template->group->total_member_count )
</span><del>- return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d member', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d member', 'buddypress' ), number_format( (int) $groups_template->group->total_member_count ) ) );
</ins><span class="cx"> else
</span><del>- return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), number_format( (int) $groups_template->group->total_member_count ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_show_wire_setting( $group = false ) {
</span><span class="lines">@@ -1202,7 +1193,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_total_group_count() {
+ echo bp_get_total_blog_count();
+}
+ function bp_get_total_group_count() {
+ return apply_filters( 'bp_get_total_group_count', groups_get_total_group_count() );
+ }
</ins><span class="cx">
</span><ins>+function bp_total_group_count_for_user( $user_id = false ) {
+ echo bp_get_total_blog_count_for_user( $user_id );
+}
+ function bp_get_total_group_count_for_user( $user_id = false ) {
+ return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ) );
+ }
+
+
</ins><span class="cx"> /***************************************************************************
</span><span class="cx"> * Group Members Template Tags
</span><span class="cx"> **/
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-messages/bp-messages-templatetags.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> function bp_messages_pagination_count() {
</span><span class="cx"> global $messages_template;
</span><span class="cx">
</span><del>- $from_num = intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1;
- $to_num = ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1) ;
</del><ins>+ $from_num = number_format( intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1 );
+ $to_num = number_format( ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing message %d to %d (of %d messages)', 'buddypress' ), $from_num, $to_num, $messages_template->total_thread_count ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/index.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/index.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-themes/bp-default/activity/index.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -19,11 +19,11 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%d)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><del>- <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%d)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
- <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%d)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
+ <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_activity_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultblogsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/index.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/index.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-themes/bp-default/blogs/index.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%d)', 'buddypress' ), bp_get_total_blog_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%s)', 'buddypress' ), bp_get_total_blog_count() ) ?></a></li>
</ins><span class="cx">
</span><del>- <?php if ( is_user_logged_in() && bp_total_blogs_for_user( bp_loggedin_user_id() ) ) : ?>
- <li id="blogs-myblogs"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%d)', 'buddypress' ), bp_total_blogs_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+ <li id="blogs-myblogs"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_blogs_directory_member_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-themes/bp-default/forums/index.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="forums-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Topics (%d)', 'buddypress' ), bp_forums_total_topic_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="forums-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ) ?></a></li>
</ins><span class="cx">
</span><del>- <?php if ( is_user_logged_in() && bp_forums_total_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
- <li id="forums-mytopics"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%d)', 'buddypress' ), bp_forums_total_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
+ <li id="forums-mytopics"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_directory_group_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/index.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/index.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-themes/bp-default/groups/index.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%d)', 'buddypress' ), groups_get_total_group_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
</ins><span class="cx">
</span><del>- <?php if ( is_user_logged_in() && groups_total_groups_for_user( bp_loggedin_user_id() ) ) : ?>
- <li id="groups-mygroups"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%d)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
+ <li id="groups-mygroups"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_directory_group_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/index.php (2197 => 2198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2009-12-18 09:34:41 UTC (rev 2197)
+++ trunk/bp-themes/bp-default/members/index.php 2009-12-18 10:20:35 UTC (rev 2198)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs">
</span><span class="cx"> <ul>
</span><del>- <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%d)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</del><ins>+ <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ) ?></a></li>
</ins><span class="cx">
</span><del>- <?php if ( is_user_logged_in() && friends_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
- <li id="members-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%d)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <?php if ( is_user_logged_in() && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
+ <li id="members-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_directory_member_types' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>