Changeset 5705 for trunk/bp-members/bp-members-buddybar.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-members/bp-members-buddybar.php (modified) (4 diffs)

trunk/bp-members/bp-members-buddybar.php

@@ -13 +13 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
-// **** "Notifications" Menu *********
+/**
+ * Notifications Menu
+ */
 function bp_adminbar_notifications_menu() {
-    global $bp;
 
     if ( !is_user_logged_in() )
@@ -104 +105 @@
  *
  * @package BuddyPress XProfile
- * @global $bp BuddyPress
  */
 function bp_members_adminbar_admin_menu() {
-    global $bp;
 
     // Only show if viewing a user
@@ -124 +123 @@
             <?php if ( bp_is_active( 'xprofile' ) ) : ?>
 
-                <li><a href="<?php bp_members_component_link( 'profile', 'edit' ); ?>"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+                <li><a href="<?php bp_members_component_link( 'profile', 'edit' ); ?>"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
 
             <?php endif ?>
 
-            <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+            <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
 
             <?php if ( !bp_is_user_spammer( bp_displayed_user_id() ) ) : ?>
 
-                <li><a href="<?php echo wp_nonce_url( bp_displayed_user_domain() . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php printf( __( "Mark as Spammer", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ); ?></a></li>
+                <li><a href="<?php echo wp_nonce_url( bp_displayed_user_domain() . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php printf( __( "Mark as Spammer", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ); ?></a></li>
 
             <?php else : ?>
@@ -140 +139 @@
             <?php endif; ?>
 
-            <li><a href="<?php echo wp_nonce_url( bp_displayed_user_domain() . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s's Account", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ); ?></a></li>
+            <li><a href="<?php echo wp_nonce_url( bp_displayed_user_domain() . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s's Account", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ); ?></a></li>
 
             <?php do_action( 'bp_members_adminbar_admin_menu' ) ?>