Changeset 5868 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

02/28/2012 10:05:51 PM (13 years ago)

Author:

djpaul

Message:

s/admin bar/toolbar. Fixes #4056

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (7 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -429 +429 @@
 }
 
-// **** Default BuddyPress admin bar logo ********
+// **** Default BuddyPress Toolbar logo ********
 function bp_adminbar_logo() {
     echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
@@ -552 +552 @@
 
 /**
- * Retrieve the admin bar display preference of a user based on context.
+ * Retrieve the Toolbar display preference of a user based on context.
  *
  * This is a direct copy of WP's private _get_admin_bar_pref()
@@ -563 +563 @@
  * @uses get_user_option()
  *
- * @return bool Whether the admin bar should be showing for this user.
+ * @return bool Whether the Toolbar should be showing for this user.
  */
 function bp_get_admin_bar_pref( $context, $user = 0 ) {
@@ -574 +574 @@
 
 /**
- * Handle the Admin Bar/BuddyBar business
+ * Handle the Toolbar/BuddyBar business
  *
  * @since 1.2.0
@@ -594 +594 @@
     global $wp_version;
 
-    // Don't show if admin bar is disabled for non-logged in users
+    // Don't show if Toolbar is disabled for non-logged in users
     if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) )
         return;
 
-    // Show the WordPress admin bar
+    // Show the WordPress Toolbar
     if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
-        // Respect user's admin bar display preferences
+        // Respect user's Toolbar display preferences
         if ( is_user_logged_in() && ( bp_get_admin_bar_pref( 'front', bp_loggedin_user_id() ) || bp_get_admin_bar_pref( 'admin', bp_loggedin_user_id() ) ) )
             return;
@@ -606 +606 @@
         show_admin_bar( true );
 
-    // Hide the WordPress admin bar
+    // Hide the WordPress Toolbar
     } elseif ( !bp_use_wp_admin_bar() ) {
 
-        // Keep the WP admin bar from loading
+        // Keep the WP Toolbar from loading
         show_admin_bar( false );
 
-        // Actions used to build the BP admin bar
+        // Actions used to build the BP Toolbar
         add_action( 'bp_adminbar_logo',  'bp_adminbar_logo' );
         add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu',         2   );
@@ -619 +619 @@
         add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu',        100 );
 
-        // Actions used to append BP admin bar to footer
+        // Actions used to append BP Toolbar to footer
         add_action( 'wp_footer',    'bp_core_admin_bar', 8 );
         add_action( 'admin_footer', 'bp_core_admin_bar'    );