sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show correct blogs in the admin bar sites menu. see #18197. 

git-svn-id: https://develop.svn.wordpress.org/trunk@18685 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Daryl Koopersmith 2011-09-16 07:18:05 +00:00
parent dca85a7db7
commit 50f062f711
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/admin-bar.php
View File

@ -193,9 +193,10 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
$blue_wp_logo_url = includes_url('images/wpmini-blue.png'); $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
foreach ( (array) $wp_admin_bar->user->blogs as $blog ) { foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
// Skip the current blog. // Skip the current blog (unless we're in the network/user admin).
if ( $blog->userblog_id == $wp_admin_bar->user->active_blog->blog_id ) if ( $blog->userblog_id == get_current_blog_id() && ! is_network_admin() && ! is_user_admin() ) {
continue; continue;
}
// @todo Replace with some favicon lookup. // @todo Replace with some favicon lookup.
//$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />'; //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';