Changeset 2375

Timestamp:

01/20/2010 10:04:08 AM (16 years ago)

Author:

apeatling

Message:

Fixes #1481 - prevent possible number_format() fail. Props jjj

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (4 diffs)
• bp-core.php (modified) (5 diffs)
• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-friends/bp-friends-templatetags.php (modified) (1 diff)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (3 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (2 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -172 +172 @@
     global $bp, $activities_template;
 
-    $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 );
+    $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 );
 
     echo sprintf( __( 'Viewing item %s to %s (of %s items)', 'buddypress' ), $from_num, $to_num, $total ); ?>  

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -170 +170 @@
     global $bp, $blogs_template;
 
-    $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 );
+    $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 );
 
     echo sprintf( __( 'Viewing blog %s to %s (of %s blogs)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
@@ -282 +282 @@
         return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
     }
-    add_filter( 'bp_get_total_blog_count', 'number_format' );
+    add_filter( 'bp_get_total_blog_count', 'bp_core_number_format' );
 
 function bp_total_blog_count_for_user( $user_id = false ) {
@@ -290 +290 @@
         return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
     }
-    add_filter( 'bp_get_total_blog_count_for_user', 'number_format' );
+    add_filter( 'bp_get_total_blog_count_for_user', 'bp_core_number_format' );
 
 /***
@@ -433 +433 @@
     global $bp, $posts_template;
 
-    $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 ) );
+    $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 ) );
 
     echo sprintf( __( 'Viewing post %s to %s (of %s posts)', 'buddypress' ), $from_num, $to_num, $posts_template->total_post_count ); ?>  

trunk/bp-core.php

@@ -1453 +1453 @@
     }
 
-    return $last_active;
+    return apply_filters( 'bp_core_get_last_activity', $last_active, $last_activity_date, $string );
+}
+
+function bp_core_number_format( $number, $decimals = false ) {
+    /* Check we actually have a number first. */
+    if ( empty( $number ) )
+        return $number;
+
+    return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
 }
 
@@ -1473 +1481 @@
         $user_id = $bp->displayed_user->id;
 
-    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 ) );
+    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 ) ) );
 }
 
@@ -1585 +1593 @@
  */
 function bp_core_email_from_name_filter() {
-    return get_blog_option( BP_ROOT_BLOG, 'blogname' );
+    return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
 }
 add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
@@ -1602 +1610 @@
     $domain = (array) explode( '/', site_url() );
 
-    return __( 'noreply', 'buddypress' ) . '@' . $domain[2];
+    return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
 }
 add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
@@ -1742 +1750 @@
     global $wpdb;
     ?>
-<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo get_num_queries(); ?> -->
+
+<!-- Generated in <?php timer_stop(1); ?> seconds. (<?php echo get_num_queries(); ?> q) -->
+
     <?php
 }

trunk/bp-core/bp-core-templatetags.php

@@ -163 +163 @@
     global $bp, $members_template;
 
-    $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 );
+    $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 );
 
     if ( 'active' == $members_template->type )
@@ -397 +397 @@
 }
     function bp_get_total_site_member_count() {
-        return apply_filters( 'bp_get_total_site_member_count', number_format( bp_core_get_total_member_count() ) );
+        return apply_filters( 'bp_get_total_site_member_count', bp_core_number_format( bp_core_get_total_member_count() ) );
     }
 
@@ -1135 +1135 @@
         return apply_filters( 'bp_get_total_member_count', bp_core_get_total_member_count() );
     }
-    add_filter( 'bp_get_total_member_count', 'number_format' );
+    add_filter( 'bp_get_total_member_count', 'bp_core_number_format' );
 
 /*** Signup form template tags **********************/

trunk/bp-forums/bp-forums-filters.php

@@ -32 +32 @@
 add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
 
-add_filter( 'bp_get_forum_topic_count_for_user', 'number_format' );
-add_filter( 'bp_get_forum_topic_count', 'number_format' );
+add_filter( 'bp_get_forum_topic_count_for_user', 'bp_core_number_format' );
+add_filter( 'bp_get_forum_topic_count', 'bp_core_number_format' );
 
 function bp_forums_filter_kses( $content ) {

trunk/bp-forums/bp-forums-templatetags.php

@@ -650 +650 @@
     global $bp, $forum_template;
 
-    $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 );
+    $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 );
 
     echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics)', 'buddypress' ), $from_num, $to_num, $total ) );

trunk/bp-friends/bp-friends-templatetags.php

@@ -209 +209 @@
         return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ) );
     }
-    add_filter( 'bp_get_total_friend_count', 'number_format' );
-?>
+    add_filter( 'bp_get_total_friend_count', 'bp_core_number_format' );
+?>

trunk/bp-groups/bp-groups-filters.php

@@ -48 +48 @@
 add_filter( 'groups_group_description_before_save', 'force_balance_tags' );
 
-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' );
+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' );
 
 /**** Filters for group forums ****/

trunk/bp-groups/bp-groups-templatetags.php

@@ -642 +642 @@
     global $bp, $groups_template;
 
-    $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 );
+    $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 );
 
     echo sprintf( __( 'Viewing group %s to %s (of %s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
@@ -672 +672 @@
 
         if ( 1 == (int) $groups_template->group->total_member_count )
-            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s member', 'buddypress' ), number_format( $groups_template->group->total_member_count ) ) );
+            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s member', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
         else
-            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s members', 'buddypress' ), number_format( $groups_template->group->total_member_count ) ) );
+            return apply_filters( 'bp_get_group_member_count', sprintf( __( '%s members', 'buddypress' ), bp_core_number_format( $groups_template->group->total_member_count ) ) );
     }
 
@@ -1398 +1398 @@
         global $members_template;
 
-        $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 );
+        $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 );
 
         return apply_filters( 'bp_get_group_member_pagination_count', sprintf( __( 'Viewing members %s to %s (of %s members)', 'buddypress' ), $from_num, $to_num, $total ) );

trunk/bp-messages/bp-messages-templatetags.php

@@ -274 +274 @@
     global $messages_template;
 
-    $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 );
+    $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 );
 
     echo sprintf( __( 'Viewing message %s to %s (of %s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?>  

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -976 +976 @@
 ul.activity-list li {
     padding: 20px 0 0 0;
+    overflow: auto;
 }
     ul.activity-list li.has-comments {
@@ -1068 +1069 @@
             height: 100px;
         }
+
+.activity-list li img {
+    margin: 0 10px 10px 0;
+}
 
 .activity-list .activity-content {

trunk/bp-themes/bp-default/_inc/global.js

@@ -83 +83 @@
 
                 j("ul.activity-list").prepend(response);
-                j("ul.activity-list li:first").addClass('new-update');
+                j("bp_core_bp_core_number_format:first").addClass('new-update');
                 j("li.new-update").hide().slideDown( 300 );
                 j("li.new-update").removeClass( 'new-update' );