WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hide Site Name menu if the user isn't a member and isn't a super admin. Always show My Sites if the user has a site, and don't remove the current site from the list. Fixes #19122. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2011-11-06 12:21:12 +00:00
parent f9b1519cfa
commit f2df6bb98a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,9 +210,14 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
function wp_admin_bar_site_menu( $wp_admin_bar ) { function wp_admin_bar_site_menu( $wp_admin_bar ) {
global $current_site; global $current_site;
// Don't show for logged out users.
if ( ! is_user_logged_in() ) if ( ! is_user_logged_in() )
return; return;
// Show only when the user is a member of this site, or they're a super admin.
if ( ! is_user_member_of_blog( get_current_user_id(), get_current_blog_id() ) && ! is_super_admin() )
return;
$blogname = get_bloginfo('name'); $blogname = get_bloginfo('name');
if ( empty( $blogname ) ) if ( empty( $blogname ) )
@ -272,8 +277,8 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
if ( ! is_user_logged_in() || ! is_multisite() ) if ( ! is_user_logged_in() || ! is_multisite() )
return; return;
// Show only when there are more than two items in the menu. // Show only when the user has at least one site, or they're a super admin.
if ( count( $wp_admin_bar->user->blogs ) <= 1 && ! is_super_admin() ) if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
return; return;
$wp_admin_bar->add_menu( array( $wp_admin_bar->add_menu( array(
@ -331,11 +336,6 @@ 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 (unless we're in the network/user admin).
if ( $blog->userblog_id == get_current_blog_id() && ! is_network_admin() && ! is_user_admin() ) {
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" />';
$blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>'; $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';