<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5868] trunk: s/admin bar/toolbar.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5868">5868</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-02-28 22:05:51 +0000 (Tue, 28 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/admin bar/toolbar. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4056">#4056</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcoreactionsphp">trunk/bp-core/bp-core-actions.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpcorebpcorecomponentphp">trunk/bp-core/bp-core-component.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreoptionsphp">trunk/bp-core/bp-core-options.php</a></li>
<li><a href="#trunkbpforumsbpforumsloaderphp">trunk/bp-forums/bp-forums-loader.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsactivityphp">trunk/bp-friends/bp-friends-activity.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsadminbarphp">trunk/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunkbpmembersbpmembersadminbarphp">trunk/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#trunkbpmembersbpmembersbuddybarphp">trunk/bp-members/bp-members-buddybar.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesloaderphp">trunk/bp-messages/bp-messages-loader.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsloaderphp">trunk/bp-settings/bp-settings-loader.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultrtlcss">trunk/bp-themes/bp-default/_inc/css/default-rtl.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-activity/bp-activity-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-blogs/bp-blogs-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/admin/bp-core-update.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> // New for BP 1.6
</span><span class="cx"> if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
</span><del>- $steps[] = __( 'Admin Bar', 'buddypress' );
</del><ins>+ $steps[] = __( 'Toolbar', 'buddypress' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $steps[] = __( 'Finish', 'buddypress' );
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> $this->step_theme();
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case __( 'Admin Bar', 'buddypress' ) :
</del><ins>+ case __( 'Toolbar', 'buddypress' ) :
</ins><span class="cx"> $this->step_admin_bar();
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -654,21 +654,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * When upgrading to BP 1.6, prompt the admin to switch to WordPress' admin bar.
</del><ins>+ * When upgrading to BP 1.6, prompt the admin to switch to WordPress' Toolbar.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.6
</span><span class="cx"> */
</span><span class="cx"> function step_admin_bar() {
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <p><?php _e( "BuddyPress now uses WordPress' Admin Bar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Admin Bar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "BuddyPress now uses WordPress' Toolbar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Toolbar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p><?php _e( "We've noticed that your site uses the old bar from earlier versions of BuddyPress.", 'buddypress' ); ?></p>
</span><span class="cx">
</span><span class="cx"> <p>
</span><span class="cx"> <label>
</span><span class="cx"> <input type="checkbox" name="keep_buddybar" value="1" />
</span><del>- <?php _e( "If you'd prefer to not switch to the WordPress Admin bar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
</del><ins>+ <?php _e( "If you'd prefer to not switch to the WordPress Toolbar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
</ins><span class="cx"> </label>
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="lines">@@ -935,7 +935,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' admin bar.
</del><ins>+ * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' Toolbar.
</ins><span class="cx"> * If they choose not to, record that preference in the options table.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.6
</span></span></pre></div>
<a id="trunkbpcorebpcoreactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-actions.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-actions.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-actions.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up BuddyPress implementation of the WP admin bar
</del><ins>+ * Set up BuddyPress implementation of the WP Toolbar
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_admin_bar() {
</span><span class="cx"> if ( bp_use_wp_admin_bar() )
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-admin.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> register_setting ( 'buddypress', '_bp_profile_sync', 'intval' );
</span><span class="cx">
</span><span class="cx"> // Throttle setting
</span><del>- add_settings_field( '_bp_admin_bar', __( 'Admin Bar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' );
</del><ins>+ add_settings_field( '_bp_admin_bar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' );
</ins><span class="cx"> register_setting ( 'buddypress', '_bp_admin_bar', 'intval' );
</span><span class="cx">
</span><span class="cx"> // Allow topic and reply revisions
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-adminbar.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * BuddyPress Core Admin Bar
</del><ins>+ * BuddyPress Core Toolbar
</ins><span class="cx"> *
</span><del>- * Handles the core functions related to the WordPress Admin Bar
</del><ins>+ * Handles the core functions related to the WordPress Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> * @subpackage Core
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> add_action( 'admin_bar_menu', 'bp_admin_bar_my_account_root', 100 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle the Admin Bar CSS
</del><ins>+ * Handle the Toolbar CSS
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress 1.5
</span><span class="cx"> */
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Admin bar styles
</del><ins>+ // Toolbar styles
</ins><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . 'bp-core/css/admin-bar.dev.css';
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-buddybar.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> $bp->doing_admin_bar = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// **** Default BuddyPress admin bar logo ********
</del><ins>+// **** Default BuddyPress Toolbar logo ********
</ins><span class="cx"> function bp_adminbar_logo() {
</span><span class="cx"> echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
</span><span class="cx"> }
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve the admin bar display preference of a user based on context.
</del><ins>+ * Retrieve the Toolbar display preference of a user based on context.
</ins><span class="cx"> *
</span><span class="cx"> * This is a direct copy of WP's private _get_admin_bar_pref()
</span><span class="cx"> *
</span><span class="lines">@@ -562,7 +562,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @uses get_user_option()
</span><span class="cx"> *
</span><del>- * @return bool Whether the admin bar should be showing for this user.
</del><ins>+ * @return bool Whether the Toolbar should be showing for this user.
</ins><span class="cx"> */
</span><span class="cx"> function bp_get_admin_bar_pref( $context, $user = 0 ) {
</span><span class="cx"> $pref = get_user_option( "show_admin_bar_{$context}", $user );
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle the Admin Bar/BuddyBar business
</del><ins>+ * Handle the Toolbar/BuddyBar business
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.2.0
</span><span class="cx"> *
</span><span class="lines">@@ -593,32 +593,32 @@
</span><span class="cx"> function bp_core_load_admin_bar() {
</span><span class="cx"> global $wp_version;
</span><span class="cx">
</span><del>- // Don't show if admin bar is disabled for non-logged in users
</del><ins>+ // Don't show if Toolbar is disabled for non-logged in users
</ins><span class="cx"> if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Show the WordPress admin bar
</del><ins>+ // Show the WordPress Toolbar
</ins><span class="cx"> if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
</span><del>- // Respect user's admin bar display preferences
</del><ins>+ // Respect user's Toolbar display preferences
</ins><span class="cx"> 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() ) ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> show_admin_bar( true );
</span><span class="cx">
</span><del>- // Hide the WordPress admin bar
</del><ins>+ // Hide the WordPress Toolbar
</ins><span class="cx"> } elseif ( !bp_use_wp_admin_bar() ) {
</span><span class="cx">
</span><del>- // Keep the WP admin bar from loading
</del><ins>+ // Keep the WP Toolbar from loading
</ins><span class="cx"> show_admin_bar( false );
</span><span class="cx">
</span><del>- // Actions used to build the BP admin bar
</del><ins>+ // Actions used to build the BP Toolbar
</ins><span class="cx"> add_action( 'bp_adminbar_logo', 'bp_adminbar_logo' );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_thisblog_menu', 6 );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
</span><span class="cx">
</span><del>- // Actions used to append BP admin bar to footer
</del><ins>+ // Actions used to append BP Toolbar to footer
</ins><span class="cx"> add_action( 'wp_footer', 'bp_core_admin_bar', 8 );
</span><span class="cx"> add_action( 'admin_footer', 'bp_core_admin_bar' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcorecomponentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-component.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-component.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-component.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> var $notification_callback;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @var array WordPress admin bar links
</del><ins>+ * @var array WordPress Toolbar links
</ins><span class="cx"> */
</span><span class="cx"> var $admin_menu;
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> // Setup navigation
</span><span class="cx"> add_action( 'bp_setup_nav', array ( $this, 'setup_nav' ), 10 );
</span><span class="cx">
</span><del>- // Setup WP Admin Bar menus
</del><ins>+ // Setup WP Toolbar menus
</ins><span class="cx"> add_action( 'bp_setup_admin_bar', array ( $this, 'setup_admin_bar' ), 10 );
</span><span class="cx">
</span><span class="cx"> // Setup component title
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the admin bar
</del><ins>+ * Setup the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $wp_admin_bar
</span><span class="cx"> * @param array $wp_admin_menus
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> if ( !bp_use_wp_admin_bar() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Do we have admin bar menus to add?
</del><ins>+ // Do we have Toolbar menus to add?
</ins><span class="cx"> if ( !empty( $wp_admin_nav ) ) {
</span><span class="cx">
</span><span class="cx"> // Set this objects menus
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-functions.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -930,19 +930,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Should we use the WP admin bar?
</del><ins>+ * Should we use the WP Toolbar?
</ins><span class="cx"> *
</span><del>- * The WP Admin Bar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
- * For BP 1.6, the WP Admin Bar is the default.
</del><ins>+ * The WP Toolbar, introduced in WP 3.1, is fully supported in BuddyPress as of BP 1.5.
+ * For BP 1.6, the WP Toolbar is the default.
</ins><span class="cx"> *
</span><del>- * @return bool False when WP Admin Bar support is disabled; true when enabled (default)
</del><ins>+ * @return bool False when WP Toolbar support is disabled; true when enabled (default)
</ins><span class="cx"> * @since 1.5
</span><span class="cx"> * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter
</span><span class="cx"> */
</span><span class="cx"> function bp_use_wp_admin_bar() {
</span><span class="cx"> $use_admin_bar = true;
</span><span class="cx">
</span><del>- // Has the WP Admin Bar constant been explicity set?
</del><ins>+ // Has the WP Toolbar constant been explicity set?
</ins><span class="cx"> if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && ! BP_USE_WP_ADMIN_BAR )
</span><span class="cx"> $use_admin_bar = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-options.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-options.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-core/bp-core-options.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> // Disable the WP to BP profile sync
</span><span class="cx"> 'bp-disable-profile-sync' => false,
</span><span class="cx">
</span><del>- // Hide the admin bar for logged out users
</del><ins>+ // Hide the Toolbar for logged out users
</ins><span class="cx"> 'hide-loggedout-adminbar' => false,
</span><span class="cx">
</span><span class="cx"> // Avatar uploads
</span><span class="lines">@@ -381,14 +381,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Is the admin bar hidden for logged out users?
</del><ins>+ * Is the Toolbar hidden for logged out users?
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> *
</span><span class="cx"> * @param $default bool Optional.Default value true
</span><span class="cx"> *
</span><del>- * @uses bp_get_option() To get the logged out admin bar option
- * @return bool Is logged out admin bar enabled or not
</del><ins>+ * @uses bp_get_option() To get the logged out Toolbar option
+ * @return bool Is logged out Toolbar enabled or not
</ins><span class="cx"> */
</span><span class="cx"> function bp_hide_loggedout_adminbar( $default = true ) {
</span><span class="cx"> return (bool) apply_filters( 'bp_hide_loggedout_adminbar', (bool) bp_get_option( 'hide-loggedout-adminbar', $default ) );
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Have we migrated to using the WordPress admin bar?
</del><ins>+ * Have we migrated to using the WordPress Toolbar?
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (r3386)
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpforumsbpforumsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-forums/bp-forums-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-activity.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-activity.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-friends/bp-friends-activity.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> add_action( 'bp_register_activity_actions', 'friends_register_activity_actions' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Format the BuddyBar/admin bar notifications for the Friends component
</del><ins>+ * Format the BuddyBar/Toolbar notifications for the Friends component
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> *
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> * @param int $item_id The primary item id
</span><span class="cx"> * @param int $secondary_item_id The secondary item id
</span><span class="cx"> * @param int $total_items The total number of messaging-related notifications waiting for the user
</span><del>- * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Admin Bar
</del><ins>+ * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Toolbar
</ins><span class="cx"> */
</span><span class="cx"> function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-friends/bp-friends-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-adminbar.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-adminbar.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-groups/bp-groups-adminbar.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * BuddyPress Groups Admin Bar
</del><ins>+ * BuddyPress Groups Toolbar
</ins><span class="cx"> *
</span><del>- * Handles the groups functions related to the WordPress Admin Bar
</del><ins>+ * Handles the groups functions related to the WordPress Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> * @subpackage Groups
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-groups/bp-groups-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-adminbar.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-adminbar.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-members/bp-members-adminbar.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * BuddyPress Members Admin Bar
</del><ins>+ * BuddyPress Members Toolbar
</ins><span class="cx"> *
</span><del>- * Handles the member functions related to the WordPress Admin Bar
</del><ins>+ * Handles the member functions related to the WordPress Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> * @subpackage MembersAdminBar
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> * Add the "My Account" menu and all submenus.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (r4151)
</span><del>- * @todo Deprecate WP 3.2 admin bar compatibility when we drop 3.2 support
</del><ins>+ * @todo Deprecate WP 3.2 Toolbar compatibility when we drop 3.2 support
</ins><span class="cx"> */
</span><span class="cx"> function bp_members_admin_bar_my_account_menu() {
</span><span class="cx"> global $bp, $wp_admin_bar;
</span></span></pre></div>
<a id="trunkbpmembersbpmembersbuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-buddybar.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-buddybar.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-members/bp-members-buddybar.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds an admin bar menu to any profile page providing site moderator actions
</del><ins>+ * Adds an Toolbar menu to any profile page providing site moderator actions
</ins><span class="cx"> * that allow capable users to clean up a users account.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress XProfile
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-messages/bp-messages-functions.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Format the BuddyBar/admin bar notifications for the Messages component
</del><ins>+ * Format the BuddyBar/Toolbar notifications for the Messages component
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><span class="cx"> *
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> * @param int $item_id The primary item id
</span><span class="cx"> * @param int $secondary_item_id The secondary item id
</span><span class="cx"> * @param int $total_items The total number of messaging-related notifications waiting for the user
</span><del>- * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Admin Bar
</del><ins>+ * @param str $format 'string' for BuddyBar-compatible notifications; 'array' for WP Toolbar
</ins><span class="cx"> */
</span><span class="cx"> function messages_format_notifications( $action, $item_id, $secondary_item_id, $total_items, $format = 'string' ) {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-messages/bp-messages-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-settings/bp-settings-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default-rtl.css (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> 5.1 - Activity
</span><span class="cx"> 5.1.1 - Activity Listing
</span><span class="cx"> 5.1.2 - Activity Comments
</span><del>- 5.2 - Admin Bar
</del><ins>+ 5.2 - Toolbar
</ins><span class="cx"> 5.3 - Ajax Loading
</span><span class="cx"> 5.4 - Directories - Members, Groups, Blogs, Forums
</span><span class="cx"> 5.5 - Error / Success Messages
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*--------------------------------------------------------------
</span><del>-5.2 - Admin Bar
</del><ins>+5.2 - Toolbar
</ins><span class="cx"> --------------------------------------------------------------*/
</span><span class="cx"> /*--------------------------------------------------------------
</span><span class="cx"> 5.3 - Ajax Loading
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> 6.1 - Activity
</span><span class="cx"> 6.1.1 - Activity Listing
</span><span class="cx"> 6.1.2 - Activity Comments
</span><del>- 6.2 - Admin Bar
</del><ins>+ 6.2 - Toolbar
</ins><span class="cx"> 6.3 - Directories - Members, Groups, Blogs, Forums
</span><span class="cx"> 6.4 - Error / Success Messages
</span><span class="cx"> 6.5 - Forms
</span><span class="lines">@@ -1493,10 +1493,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*--------------------------------------------------------------
</span><del>-6.2 - Admin Bar
</del><ins>+6.2 - Toolbar
</ins><span class="cx"> --------------------------------------------------------------*/
</span><span class="cx"> #wp-admin-bar .padder {
</span><del>- width: 95% !important; /* Line up the admin bar with the content body in this theme */
</del><ins>+ width: 95% !important; /* Line up the Toolbar with the content body in this theme */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-themes/bp-default/_inc/global.js 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -1182,7 +1182,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx">
</span><del>- /* Admin Bar & wp_list_pages Javascript IE6 hover class */
</del><ins>+ /* Toolbar & wp_list_pages Javascript IE6 hover class */
</ins><span class="cx"> jq("#wp-admin-bar ul.main-nav li, #nav li").mouseover( function() {
</span><span class="cx"> jq(this).addClass('sfhover');
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (5867 => 5868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2012-02-28 19:56:45 UTC (rev 5867)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2012-02-28 22:05:51 UTC (rev 5868)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the admin bar
</del><ins>+ * Set up the Toolbar
</ins><span class="cx"> *
</span><span class="cx"> * @global obj $bp
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>