<!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][5289] trunk: First pass at updating the admin/toolbar for WordPress 3.3.</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/5289">5289</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-11-06 06:52:09 +0000 (Sun, 06 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at updating the admin/toolbar for WordPress 3.3. See <a href="http://buddypress.trac.wordpress.org/ticket/3596">#3596</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorehooksphp">trunk/bp-core/bp-core-hooks.php</a></li>
<li><a href="#trunkbpcorecssadminbarcss">trunk/bp-core/css/admin-bar.css</a></li>
<li><a href="#trunkbpcorecssadminbardevcss">trunk/bp-core/css/admin-bar.dev.css</a></li>
<li><a href="#trunkbpmembersbpmembersadminbarphp">trunk/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#trunkbpmembersbpmembersfiltersphp">trunk/bp-members/bp-members-filters.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcoredeprecated16php">trunk/bp-core/deprecated/1.6.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-core/bp-core-adminbar.php 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> <?php
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * BuddyPress Core Admin Bar
</span><span class="cx"> *
</span><span class="lines">@@ -15,234 +16,44 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Unhook the WordPress core menus.
</del><ins>+ * Adds the secondary BuddyPress area to the my-account menu
</ins><span class="cx"> *
</span><del>- * @since BuddyPress (r4151)
- *
- * @uses remove_action
- * @uses is_network_admin()
- * @uses is_user_admin()
</del><ins>+ * @since BuddyPress 1.6
+ * @global WP_Admin_Bar $wp_admin_bar
+ * @return If doing ajax
</ins><span class="cx"> */
</span><del>-function bp_admin_bar_remove_wp_menus() {
</del><ins>+function bp_admin_bar_my_account_secondary() {
+ global $wp_admin_bar;
</ins><span class="cx">
</span><del>- /**
- * WP 3.2 hooks
- */
- remove_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_dashboard_view_site_menu', 25 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
</del><ins>+ // Bail if this is an ajax request
+ if ( defined( 'DOING_AJAX' ) )
+ return;
</ins><span class="cx">
</span><del>- // Don't show the 'Edit Page' menu on BP pages
- if ( !bp_is_blog_page() )
- remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 );
-
- if ( !is_network_admin() && !is_user_admin() ) {
- remove_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 60 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
- }
-
- /**
- * WP 3.3+
- */
- remove_action( 'admin_bar_menu', 'wp_admin_bar_blog_front_menu', 30 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );
-
- // Menus specific to blog posts shouldn't show on BP pages
- if ( !bp_is_blog_page() && !is_network_admin() && !is_admin() ) {
- remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 50 );
- remove_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
- }
-
- // Don't show the Updates menu on the front end
- if ( !is_network_admin() && !is_admin() ) {
- remove_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 );
- }
-}
-add_action( 'bp_init', 'bp_admin_bar_remove_wp_menus', 2 );
-
-/**
- * Add a menu for the root site of this BuddyPress network
- *
- * @global type $bp
- * @global type $wp_admin_bar
- * @return If in ajax
- */
-function bp_admin_bar_root_site() {
- global $bp, $wp_admin_bar;
-
- // Create the root blog menu
- $wp_admin_bar->add_menu( array(
- 'id' => 'bp-root-blog',
- 'title' => get_blog_option( bp_get_root_blog_id(), 'blogname' ),
- 'href' => bp_get_root_domain()
- ) );
-
- // Logged in user
</del><ins>+ // Only add menu for logged in user
</ins><span class="cx"> if ( is_user_logged_in() ) {
</span><span class="cx">
</span><del>- // Dashboard links
- if ( is_super_admin() ) {
-
- // Add site admin link
- $wp_admin_bar->add_menu( array(
- 'id' => 'dashboard',
- 'parent' => 'bp-root-blog',
- 'title' => __( 'Admin Dashboard', 'buddypress' ),
- 'href' => get_admin_url( bp_get_root_blog_id() )
- ) );
-
- // Add network admin link
- if ( is_multisite() ) {
-
- // Link to the network admin dashboard
- $wp_admin_bar->add_menu( array(
- 'id' => 'network-dashboard',
- 'parent' => 'bp-root-blog',
- 'title' => __( 'Network Dashboard', 'buddypress' ),
- 'href' => network_admin_url()
- ) );
- }
- }
</del><ins>+ // Add secondary parent item for all BuddyPress components
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'my-account',
+ 'id' => 'my-account-buddypress',
+ 'title' => '&nbsp;',
+ 'meta' => array(
+ 'class' => 'secondary',
+ )
+ ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-add_action( 'admin_bar_menu', 'bp_admin_bar_root_site', 15 );
</del><ins>+add_action( 'admin_bar_menu', 'bp_admin_bar_my_account_secondary', 9999 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * Add the "My Sites/[Site Name]" menu and all submenus.
- */
-function bp_admin_bar_my_sites_menu() {
- global $wpdb, $wp_admin_bar;
-
- /* Add the 'My Sites' menu if the user has more than one site. */
- if ( count( $wp_admin_bar->user->blogs ) <= 1 )
- return;
-
- $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Sites' ), 'href' => admin_url( 'my-sites.php' ) ) );
-
- $default = includes_url( 'images/wpmini-blue.png' );
-
- foreach ( (array)$wp_admin_bar->user->blogs as $blog ) {
- // @todo Replace with some favicon lookup.
- //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $default ) ) . '" alt="Blavatar" width="16" height="16" />';
- $blavatar = '<img src="' . esc_url( $default ) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
-
- $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
-
- $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url( $blog->userblog_id ) ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => get_admin_url( $blog->userblog_id ) ) );
-
- if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => get_admin_url( $blog->userblog_id, 'post-new.php' ) ) );
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => get_admin_url( $blog->userblog_id, 'edit-comments.php' ) ) );
- }
-
- $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Visit Site' ), 'href' => get_home_url( $blog->userblog_id ) ) );
- }
-}
-add_action( 'admin_bar_menu', 'bp_admin_bar_my_sites_menu', 17 );
-
-/**
- * Add edit comments link with awaiting moderation count bubble
- */
-function bp_admin_bar_comments_menu( $wp_admin_bar ) {
- global $wp_admin_bar;
-
- if ( !current_user_can( 'edit_posts' ) )
- return;
-
- $awaiting_mod = wp_count_comments();
- $awaiting_mod = $awaiting_mod->moderated;
-
- $awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod' class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span>" : '';
- $wp_admin_bar->add_menu( array( 'parent' => 'dashboard', 'id' => 'comments', 'title' => sprintf( __( 'Comments %s' ), $awaiting_mod ), 'href' => admin_url( 'edit-comments.php' ) ) );
-}
-add_action( 'bp_setup_admin_bar', 'bp_admin_bar_comments_menu', 3 );
-
-/**
- * Add "Appearance" menu with widget and nav menu submenu
- */
-function bp_admin_bar_appearance_menu() {
- global $wp_admin_bar;
-
- // You can have edit_theme_options but not switch_themes.
- if ( !current_user_can( 'switch_themes' ) && !current_user_can( 'edit_theme_options' ) )
- return;
-
- $wp_admin_bar->add_menu( array( 'parent' => 'dashboard', 'id' => 'appearance', 'title' => __( 'Appearance' ), 'href' => admin_url( 'themes.php' ) ) );
-
- if ( !current_user_can( 'edit_theme_options' ) )
- return;
-
- if ( current_user_can( 'switch_themes' ) )
- $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __( 'Themes' ), 'href' => admin_url( 'themes.php' ) ) );
-
- if ( current_theme_supports( 'widgets' ) )
- $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __( 'Widgets' ), 'href' => admin_url( 'widgets.php' ) ) );
-
- if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
- $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __( 'Menus' ), 'href' => admin_url( 'nav-menus.php' ) ) );
-
- if ( current_theme_supports( 'custom-background' ) )
- $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __( 'Background' ), 'href' => admin_url( 'themes.php?page=custom-background' ) ) );
-
- if ( current_theme_supports( 'custom-header' ) )
- $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __( 'Header' ), 'href' => admin_url( 'themes.php?page=custom-header' ) ) );
-}
-add_action( 'bp_setup_admin_bar', 'bp_admin_bar_appearance_menu', 3 );
-
-/**
- * Provide an update link if theme/plugin/core updates are available
- */
-function bp_admin_bar_updates_menu() {
- global $wp_admin_bar;
-
- if ( !current_user_can( 'install_plugins' ) )
- return;
-
- $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
- $update_plugins = get_site_transient( 'update_plugins' );
- if ( !empty( $update_plugins->response ) )
- $plugin_update_count = count( $update_plugins->response );
- $update_themes = get_site_transient( 'update_themes' );
- if ( !empty( $update_themes->response ) )
- $theme_update_count = count( $update_themes->response );
- /* @todo get_core_updates() is only available on admin page loads
- $update_wordpress = get_core_updates( array('dismissed' => false) );
- if ( !empty($update_wordpress) && !in_array( $update_wordpress[0]->response, array('development', 'latest') ) )
- $wordpress_update_count = 1;
- */
-
- $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
-
- if ( !$update_count )
- return;
-
- $update_title = array( );
- if ( $wordpress_update_count )
- $update_title[] = sprintf( __( '%d WordPress Update' ), $wordpress_update_count );
- if ( $plugin_update_count )
- $update_title[] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $plugin_update_count ), $plugin_update_count );
- if ( $theme_update_count )
- $update_title[] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $theme_update_count ), $theme_update_count );
-
- $update_title = !empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
-
- $update_title = "<span title='$update_title'>";
- $update_title .= sprintf( __( 'Updates %s' ), "<span id='ab-updates' class='update-count'>" . number_format_i18n( $update_count ) . '</span>' );
- $update_title .= '</span>';
-
- $wp_admin_bar->add_menu( array( 'parent' => 'dashboard', 'id' => 'updates', 'title' => $update_title, 'href' => network_admin_url( 'update-core.php' ) ) );
-}
-add_action( 'bp_setup_admin_bar', 'bp_admin_bar_updates_menu', 3 );
-
-/**
</del><span class="cx"> * Handle the Admin Bar CSS
</span><ins>+ *
+ * @since BuddyPress 1.5
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_load_admin_bar_css() {
</span><del>- global $wp_version;
</del><span class="cx">
</span><ins>+ $version = '2011116';
+
</ins><span class="cx"> if ( !bp_use_wp_admin_bar() )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -252,7 +63,7 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array( 'admin-bar' ), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array( 'admin-bar' ), $version );
</ins><span class="cx">
</span><span class="cx"> if ( !is_rtl() )
</span><span class="cx"> return;
</span><span class="lines">@@ -262,7 +73,8 @@
</span><span class="cx"> else
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar-rtl.css';
</span><span class="cx">
</span><del>- wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
</del><ins>+ wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), $version );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_core_load_admin_bar_css' );
</span><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcorehooksphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-hooks.php (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-hooks.php 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-core/bp-core-hooks.php 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -15,28 +15,28 @@
</span><span class="cx"> /** Init **********************************************************************/
</span><span class="cx">
</span><span class="cx"> // Attach bp_init to WordPress init
</span><del>-add_action( 'init', 'bp_init' );
</del><ins>+add_action( 'init', 'bp_init' );
</ins><span class="cx">
</span><span class="cx"> // Parse the URI and set globals
</span><del>-add_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
</del><ins>+add_action( 'bp_init', 'bp_core_set_uri_globals', 2 );
</ins><span class="cx">
</span><span class="cx"> // Setup component globals
</span><del>-add_action( 'bp_init', 'bp_setup_globals', 4 );
</del><ins>+add_action( 'bp_init', 'bp_setup_globals', 4 );
</ins><span class="cx">
</span><span class="cx"> // Setup the navigation menu
</span><del>-add_action( 'bp_init', 'bp_setup_nav', 7 );
</del><ins>+add_action( 'bp_init', 'bp_setup_nav', 7 );
</ins><span class="cx">
</span><span class="cx"> // Setup the navigation menu
</span><del>-add_action( 'admin_bar_menu', 'bp_setup_admin_bar' );
</del><ins>+add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 11 );
</ins><span class="cx">
</span><span class="cx"> // Setup the title
</span><del>-add_action( 'bp_init', 'bp_setup_title', 9 );
</del><ins>+add_action( 'bp_init', 'bp_setup_title', 9 );
</ins><span class="cx">
</span><span class="cx"> // Setup widgets
</span><del>-add_action( 'bp_loaded', 'bp_setup_widgets' );
</del><ins>+add_action( 'bp_loaded', 'bp_setup_widgets' );
</ins><span class="cx">
</span><span class="cx"> // Setup admin bar
</span><del>-add_action( 'bp_loaded', 'bp_core_load_admin_bar' );
</del><ins>+add_action( 'bp_loaded', 'bp_core_load_admin_bar' );
</ins><span class="cx">
</span><span class="cx"> /** The hooks *****************************************************************/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorecssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin-bar.css (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin-bar.css 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-core/css/admin-bar.css 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul{left:0;right:auto;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a{border-left:none;background:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a img,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 23px 0 -5px;padding:0;background:#eee;float:none;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:30px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a{border-left:none;backgroun
d:url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 23px 0 -5px;padding:0;background:#eee;float:none;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0;}#wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications{background:#eee;color:#333;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;}
</del><span class="cx">\ No newline at end of file
</span><ins>+#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a img,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{width:16px;height:16px;display:inline;border:1px solid #999;vertical-align:middle;margin:-2px 10px 0 -5px;padding:0;background:#eee;float:none}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:0}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:0}#wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications{background:#21759b;color:#fff;text-shadow:none;display:inline;padding:2px 5px;font-size:10px;font-weight:bold;-moz-border-radius:10px;-khtml-border-radius:10px;-webkit-border-radius:10px;border-radius:10px}#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications{margin:0}#wpadminbar .quic
klinks li#wp-admin-bar-bp-notifications #ab-pending-notifications.alert{background-color:#1fb3dd;color:#fff}#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications>a{padding:0 .5em}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorecssadminbardevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin-bar.dev.css (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin-bar.dev.css 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-core/css/admin-bar.dev.css 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -1,14 +1,5 @@
</span><del>-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul {
- left: 0;
- right: auto;
-}
</del><span class="cx">
</span><span class="cx"> /* Displayed User */
</span><del>-#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a {
- border-left: none;
- background: url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;
-}
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a img,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a img {
</span><span class="cx"> width: 16px;
</span><span class="lines">@@ -16,36 +7,26 @@
</span><span class="cx"> display: inline;
</span><span class="cx"> border: 1px solid #999;
</span><span class="cx"> vertical-align: middle;
</span><del>- margin: -2px 23px 0 -5px;
</del><ins>+ margin: -2px 10px 0 -5px;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> background: #eee;
</span><span class="cx"> float: none;
</span><span class="cx"> }
</span><del>-#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,
-#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
- left: 30px;
-}
-#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,
-#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
- left: 0;
-}
</del><span class="cx">
</span><span class="cx"> /* Displayed Group */
</span><del>-#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a {
- border-left: none;
- background: url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;
-}
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><ins>+
+/* Notifications */
</ins><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications {
</span><del>- background: #eee;
- color: #333;
</del><ins>+ background: #21759B;
+ color: #fff;
</ins><span class="cx"> text-shadow: none;
</span><span class="cx"> display: inline;
</span><span class="cx"> padding: 2px 5px;
</span><span class="lines">@@ -55,4 +36,17 @@
</span><span class="cx"> -khtml-border-radius: 10px;
</span><span class="cx"> -webkit-border-radius: 10px;
</span><span class="cx"> border-radius: 10px;
</span><ins>+}
+
+#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications {
+ margin: 0
+}
+
+#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications.alert {
+ background-color: #1fb3dd;
+ color: #fff;
+}
+
+#wpadminbar .quicklinks li#wp-admin-bar-bp-notifications > a {
+ padding: 0 .5em;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcoredeprecated16php"></a>
<div class="addfile"><h4>Added: trunk/bp-core/deprecated/1.6.php (0 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.6.php (rev 0)
+++ trunk/bp-core/deprecated/1.6.php 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<?php
+
+/**
+ * Deprecated Functions
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ * @deprecated Since 1.6
+ */
+
+/** Toolbar functions *********************************************************/
+
+function bp_admin_bar_remove_wp_menus() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_admin_bar_root_site() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_admin_bar_my_sites_menu() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_admin_bar_comments_menu( $wp_admin_bar ) {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_admin_bar_appearance_menu() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_admin_bar_updates_menu() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+function bp_members_admin_bar_my_account_logout() {
+ _deprecated_function( __FUNCTION__, '1.6' );
+}
+
+?>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/bp-core/deprecated/1.6.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-adminbar.php (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-adminbar.php 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-members/bp-members-adminbar.php 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -38,8 +38,9 @@
</span><span class="cx"> // Some admin bar setup in WP 3.2 differs from WP 3.3+.
</span><span class="cx"> // Backward-compatibility will be deprecated at some point.
</span><span class="cx"> if ( version_compare( (float)$wp_version, '3.3', '>=' ) ) {
</span><ins>+
</ins><span class="cx"> // Stored in the global so we can add menus easily later on
</span><del>- $bp->my_account_menu_id = 'my-account';
</del><ins>+ $bp->my_account_menu_id = 'my-account-buddypress';
</ins><span class="cx">
</span><span class="cx"> $title = bp_get_loggedin_user_fullname() . $avatar;
</span><span class="cx">
</span><span class="lines">@@ -181,17 +182,19 @@
</span><span class="cx"> if ( !is_user_logged_in() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' ) ) {
- $menu_title = sprintf( __( 'Notifications <span id="ab-pending-notifications" class="pending-count">%s</span>', 'buddypress' ), count( $notifications ) );
- } else {
- $menu_title = __( 'Notifications', 'buddypress' );
- }
</del><ins>+ $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' );
+ $count = !empty( $notifications ) ? count( $notifications ) : '0';
+ $alert_class = (int) $count > 0 ? 'pending-count alert' : 'count no-alert';
+ $menu_title = '<span id="ab-pending-notifications" class="' . $alert_class . '">' . $count . '</span>';
</ins><span class="cx">
</span><span class="cx"> // Add the top-level Notifications button
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'id' => 'bp-notifications',
</span><span class="cx"> 'title' => $menu_title,
</span><del>- 'href' => bp_loggedin_user_domain()
</del><ins>+ 'href' => bp_loggedin_user_domain(),
+ 'meta' => array(
+ 'class' => 'opposite',
+ )
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $notifications ) ) {
</span><span class="lines">@@ -216,31 +219,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_bar_menu', 'bp_members_admin_bar_notifications_menu', 90 );
</span><span class="cx">
</span><del>-/**
- * Make sure the logout link is at the bottom of the "My Account" menu
- *
- * @since BuddyPress (r4151)
- *
- * @global obj $bp
- * @global obj $wp_admin_bar
- */
-function bp_members_admin_bar_my_account_logout() {
- global $bp, $wp_admin_bar;
-
- // Bail if this is an ajax request
- if ( defined( 'DOING_AJAX' ) )
- return;
-
- if ( is_user_logged_in() ) {
- // Log out
- $wp_admin_bar->add_menu( array(
- 'parent' => $bp->my_account_menu_id,
- 'id' => $bp->my_account_menu_id . '-logout',
- 'title' => __( 'Log Out', 'buddypress' ),
- 'href' => wp_logout_url()
- ) );
- }
-}
-add_action( 'admin_bar_menu', 'bp_members_admin_bar_my_account_logout', 9999 );
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-filters.php (5288 => 5289)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-filters.php 2011-11-05 23:31:07 UTC (rev 5288)
+++ trunk/bp-members/bp-members-filters.php 2011-11-06 06:52:09 UTC (rev 5289)
</span><span class="lines">@@ -45,4 +45,31 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_loaded', 'bp_members_signup_sanitization' );
</span><span class="cx">
</span><ins>+/**
+ * Filter the user profile URL to point to BuddyPress profile edit
+ *
+ * @since BuddyPress 1.6
+ *
+ * @global BuddyPress $bp
+ * @param string $url
+ * @param int $user_id
+ * @param string $scheme
+ * @return string
+ */
+function bp_members_edit_profile_url( $url, $user_id, $scheme = 'admin' ) {
+ global $bp;
+
+ // Default to $url
+ $profile_link = $url;
+
+ // If xprofile is active, use profile domain link
+ if ( bp_is_active( 'xprofile' ) ) {
+ $user_domain = bp_core_get_user_domain( $user_id );
+ $profile_link = trailingslashit( $user_domain . $bp->profile->slug . '/edit' );
+ }
+
+ return apply_filters( 'bp_members_edit_profile_url', $profile_link, $url, $user_id, $scheme );
+}
+add_filter( 'edit_profile_url', 'bp_members_edit_profile_url', 10, 3 );
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>