<!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] [2375] trunk: Fixes #1481 - prevent possible number_format()
fail.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2375</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-20 10:04:08 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1481 - prevent possible number_format() fail. Props jjj</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="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</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 (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -171,9 +171,9 @@
</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 = 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 ) );
- $total = number_format( $activities_template->total_activity_count );
</del><ins>+ $from_num = bp_core_number_format( intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1 );
+ $to_num = bp_core_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 ) );
+ $total = bp_core_number_format( $activities_template->total_activity_count );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ); ?> &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 (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -169,9 +169,9 @@
</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 = 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 ) );
- $total = number_format( $blogs_template->total_blog_count );
</del><ins>+ $from_num = bp_core_number_format( intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1 );
+ $to_num = bp_core_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 ) );
+ $total = bp_core_number_format( $blogs_template->total_blog_count );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> function bp_get_total_blog_count() {
</span><span class="cx"> return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
</span><span class="cx"> }
</span><del>- add_filter( 'bp_get_total_blog_count', 'number_format' );
</del><ins>+ add_filter( 'bp_get_total_blog_count', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> function bp_total_blog_count_for_user( $user_id = false ) {
</span><span class="cx"> echo bp_get_total_blog_count_for_user( $user_id );
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> function bp_get_total_blog_count_for_user( $user_id = false ) {
</span><span class="cx"> return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
</span><span class="cx"> }
</span><del>- add_filter( 'bp_get_total_blog_count_for_user', 'number_format' );
</del><ins>+ add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * Technically the template loops for blog posts and comments are deprecated.
</span><span class="lines">@@ -432,8 +432,8 @@
</span><span class="cx"> function bp_post_pagination_count() {
</span><span class="cx"> global $bp, $posts_template;
</span><span class="cx">
</span><del>- $from_num = number_format( intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1 );
- $to_num = number_format( ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) );
</del><ins>+ $from_num = bp_core_number_format( intval( ( $posts_template->pag_page - 1 ) * $posts_template->pag_num ) + 1 );
+ $to_num = bp_core_number_format( ( $from_num + ( $posts_template->pag_num - 1 ) > $posts_template->total_post_count ) ? $posts_template->total_post_count : $from_num + ( $posts_template->pag_num - 1 ) );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing post %s to %s (of %s posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -162,9 +162,9 @@
</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 = 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) );
- $total = number_format( $members_template->total_member_count );
</del><ins>+ $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) );
+ $total = bp_core_number_format( $members_template->total_member_count );
</ins><span class="cx">
</span><span class="cx"> if ( 'active' == $members_template->type )
</span><span class="cx"> echo sprintf( __( 'Viewing member %s to %s (of %s active members)', 'buddypress' ), $from_num, $to_num, $total );
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> echo bp_get_total_site_member_count();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_total_site_member_count() {
</span><del>- return apply_filters( 'bp_get_total_site_member_count', number_format( bp_core_get_total_member_count() ) );
</del><ins>+ return apply_filters( 'bp_get_total_site_member_count', bp_core_number_format( bp_core_get_total_member_count() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> function bp_get_total_member_count() {
</span><span class="cx"> return apply_filters( 'bp_get_total_member_count', bp_core_get_total_member_count() );
</span><span class="cx"> }
</span><del>- add_filter( 'bp_get_total_member_count', 'number_format' );
</del><ins>+ add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /*** Signup form template tags **********************/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-core.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -1452,10 +1452,18 @@
</span><span class="cx"> $last_active = sprintf( $string, $last_active );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $last_active;
</del><ins>+ return apply_filters( 'bp_core_get_last_activity', $last_active, $last_activity_date, $string );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_core_number_format( $number, $decimals = false ) {
+ /* Check we actually have a number first. */
+ if ( empty( $number ) )
+ return $number;
</ins><span class="cx">
</span><ins>+ return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
+}
+
+
</ins><span class="cx"> /**
</span><span class="cx"> * bp_core_get_all_posts_for_user()
</span><span class="cx"> *
</span><span class="lines">@@ -1472,7 +1480,7 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- return $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) );
</del><ins>+ return apply_filters( 'bp_core_get_all_posts_for_user', $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1584,7 +1592,7 @@
</span><span class="cx"> * @return The blog name for the root blog
</span><span class="cx"> */
</span><span class="cx"> function bp_core_email_from_name_filter() {
</span><del>- return get_blog_option( BP_ROOT_BLOG, 'blogname' );
</del><ins>+ return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
</ins><span class="cx"> }
</span><span class="cx"> add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
</span><span class="cx">
</span><span class="lines">@@ -1601,7 +1609,7 @@
</span><span class="cx"> function bp_core_email_from_address_filter() {
</span><span class="cx"> $domain = (array) explode( '/', site_url() );
</span><span class="cx">
</span><del>- return __( 'noreply', 'buddypress' ) . '@' . $domain[2];
</del><ins>+ return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
</ins><span class="cx"> }
</span><span class="cx"> add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
</span><span class="cx">
</span><span class="lines">@@ -1741,7 +1749,9 @@
</span><span class="cx"> function bp_core_print_generation_time() {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> ?>
</span><del>-<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo get_num_queries(); ?> -->
</del><ins>+
+<!-- Generated in <?php timer_stop(1); ?> seconds. (<?php echo get_num_queries(); ?> q) -->
+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_footer', 'bp_core_print_generation_time' );
</span></span></pre></div>
<a id="trunkbpforumsbpforumsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-filters.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-filters.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-forums/bp-forums-filters.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
</span><span class="cx">
</span><del>-add_filter( 'bp_get_forum_topic_count_for_user', 'number_format' );
-add_filter( 'bp_get_forum_topic_count', 'number_format' );
</del><ins>+add_filter( 'bp_get_forum_topic_count_for_user', 'bp_core_number_format' );
+add_filter( 'bp_get_forum_topic_count', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> function bp_forums_filter_kses( $content ) {
</span><span class="cx"> global $allowedtags;
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -649,9 +649,9 @@
</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 = 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 ) );
- $total = number_format( $forum_template->total_topic_count );
</del><ins>+ $from_num = bp_core_number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
+ $to_num = bp_core_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 ) );
+ $total = bp_core_number_format( $forum_template->total_topic_count );
</ins><span class="cx">
</span><span class="cx"> echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics)', 'buddypress' ), $from_num, $to_num, $total ) );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-templatetags.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-friends/bp-friends-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -208,5 +208,5 @@
</span><span class="cx"> function bp_get_total_friend_count( $user_id = false ) {
</span><span class="cx"> return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ) );
</span><span class="cx"> }
</span><del>- add_filter( 'bp_get_total_friend_count', 'number_format' );
</del><ins>+ add_filter( 'bp_get_total_friend_count', 'bp_core_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 (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-filters.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-groups/bp-groups-filters.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -47,9 +47,9 @@
</span><span class="cx"> add_filter( 'groups_group_name_before_save', 'force_balance_tags' );
</span><span class="cx"> add_filter( 'groups_group_description_before_save', 'force_balance_tags' );
</span><span class="cx">
</span><del>-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' );
</del><ins>+add_filter( 'bp_get_total_group_count', 'bp_core_number_format' );
+add_filter( 'bp_get_group_total_for_member', 'bp_core_number_format' );
+add_filter( 'bp_get_group_total_members', 'bp_core_number_format' );
</ins><span class="cx">
</span><span class="cx"> /**** Filters for group forums ****/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-templatetags.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-groups/bp-groups-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -641,9 +641,9 @@
</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 = 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 ) );
- $total = number_format( $groups_template->total_group_count );
</del><ins>+ $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 ) );
+ $total = bp_core_number_format( $groups_template->total_group_count );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span><span class="lines">@@ -671,9 +671,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( __( '%s member', 'buddypress' ), number_format( $groups_template->group->total_member_count ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s member', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
</ins><span class="cx"> else
</span><del>- return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s members', 'buddypress' ), number_format( $groups_template->group->total_member_count ) ) );
</del><ins>+ return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s members', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_group_forum_permalink( $deprecated = false ) {
</span><span class="lines">@@ -1397,9 +1397,9 @@
</span><span class="cx"> function bp_get_group_member_pagination_count() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><del>- $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 ) );
- $total = number_format( $members_template->total_member_count );
</del><ins>+ $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 ) );
+ $total = bp_core_number_format( $members_template->total_member_count );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-messages/bp-messages-templatetags.php 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -273,9 +273,9 @@
</span><span class="cx"> function bp_messages_pagination_count() {
</span><span class="cx"> global $messages_template;
</span><span class="cx">
</span><del>- $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 ) );
- $total = number_format( $messages_template->total_thread_count );
</del><ins>+ $from_num = bp_core_number_format( intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1 );
+ $to_num = bp_core_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 ) );
+ $total = bp_core_number_format( $messages_template->total_thread_count );
</ins><span class="cx">
</span><span class="cx"> echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
</span><span class="cx"> <span class="ajax-loader"></span><?php
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -975,6 +975,7 @@
</span><span class="cx">
</span><span class="cx"> ul.activity-list li {
</span><span class="cx"> padding: 20px 0 0 0;
</span><ins>+ overflow: auto;
</ins><span class="cx"> }
</span><span class="cx"> ul.activity-list li.has-comments {
</span><span class="cx"> padding-bottom: 20px;
</span><span class="lines">@@ -1068,6 +1069,10 @@
</span><span class="cx"> height: 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.activity-list li img {
+ margin: 0 10px 10px 0;
+}
+
</ins><span class="cx"> .activity-list .activity-content {
</span><span class="cx"> margin-left: 70px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2374 => 2375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-20 09:45:31 UTC (rev 2374)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-20 10:04:08 UTC (rev 2375)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> j("ul.activity-list").prepend(response);
</span><del>- j("ul.activity-list li:first").addClass('new-update');
</del><ins>+ j("bp_core_bp_core_number_format:first").addClass('new-update');
</ins><span class="cx"> j("li.new-update").hide().slideDown( 300 );
</span><span class="cx"> j("li.new-update").removeClass( 'new-update' );
</span><span class="cx"> j("textarea#whats-new").val('');
</span></span></pre>
</div>
</div>
</body>
</html>