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

Multisite: Replace `is_super_admin()` with `manage_network` for admin bar permissions. 

Props iaaxpage.
Fixes #39064. See #37616.

Built from https://develop.svn.wordpress.org/trunk@39492


git-svn-id: http://core.svn.wordpress.org/trunk@39432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2016-12-04 21:21:42 +00:00
parent 697f079a19
commit e72d3d6b5d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,8 +301,9 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
return;
// Show only when the user is a member of this site, or they're a super admin.
if ( ! is_user_member_of_blog() && ! is_super_admin() )
if ( ! is_user_member_of_blog() && ! current_user_can( 'manage_network' ) ) {
return;
}
$blogname = get_bloginfo('name');
@ -415,8 +416,9 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
return;
// 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 && ! current_user_can( 'manage_network' ) ) {
return;
}
if ( $wp_admin_bar->user->active_blog ) {
$my_sites_url = get_admin_url( $wp_admin_bar->user->active_blog->blog_id, 'my-sites.php' );
@ -430,7 +432,7 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
'href' => $my_sites_url,
) );
if ( is_super_admin() ) {
if ( current_user_can( 'manage_network' ) ) {
$wp_admin_bar->add_group( array(
'parent' => 'my-sites',
'id' => 'my-sites-super-admin',
@ -486,7 +488,7 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
'parent' => 'my-sites',
'id' => 'my-sites-list',
'meta' => array(
'class' => is_super_admin() ? 'ab-sub-secondary' : '',
'class' => current_user_can( 'manage_network' ) ? 'ab-sub-secondary' : '',
),
) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-39490';
$wp_version = '4.8-alpha-39492';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.