Changeset 5705 for trunk/bp-activity/bp-activity-loader.php

Timestamp:

02/11/2012 03:21:00 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Replace direct references to $bp user fullname and user_login with their functional equivalents, and kill off some $bp global usage in the process. See #3994, #3989.

File:

• trunk/bp-activity/bp-activity-loader.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-loader.php

@@ -111 +111 @@
          */
         function setup_nav() {
-                global $bp;
+
+                $sub_nav = array();
 
                 // Add 'Activity' to the main navigation
@@ -227 +228 @@
 
                         // Unread message count
-                        if ( $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) {
-                                $title = sprintf( __( 'Mentions <span class="count">%s</span>', 'buddypress' ), $count );
+                        $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
+                        if ( !empty( $count ) ) {
+                                $title = sprintf( __( 'Mentions <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
                         } else {
                                 $title = __( 'Mentions', 'buddypress' );
@@ -312 +314 @@
                                         'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
                                 ) );
-                                $bp->bp_options_title  = $bp->displayed_user->fullname;
+                                $bp->bp_options_title  = bp_get_displayed_user_fullname();
                         }
                 }