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

Timestamp:

02/11/2012 03:21:00 AM (13 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-friends/bp-friends-loader.php (modified) (3 diffs)

trunk/bp-friends/bp-friends-loader.php

@@ -91 +91 @@
         global $bp;
 
+        $sub_nav = array();
+
         // Add 'Friends' to the main navigation
         $main_nav = array(
@@ -146 +148 @@
 
             // Pending friend requests
-            if ( $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ) ) {
-                $title   = sprintf( __( 'Friends <span class="count">%s</span>',          'buddypress' ), $count );
-                $pending = sprintf( __( 'Pending Requests <span class="count">%s</span>', 'buddypress' ), $count );
+            $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) );
+            if ( !empty( $count ) ) {
+                $title   = sprintf( __( 'Friends <span class="count">%s</span>',          'buddypress' ), number_format_i18n( $count ) );
+                $pending = sprintf( __( 'Pending Requests <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
             } else {
                 $title   = __( 'Friends',             'buddypress' );
@@ -200 +203 @@
                     '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();
             }
         }