Changeset 39492

Timestamp:

12/04/2016 09:20:44 PM (8 years ago)

Author:

flixos90

Message:

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

Props iaaxpage.
Fixes #39064. See #37616.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (4 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -302 +302 @@
 
     // 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() )
-        return;
+    if ( ! is_user_member_of_blog() && ! current_user_can( 'manage_network' ) ) {
+        return;
+    }
 
     $blogname = get_bloginfo('name');
@@ -416 +417 @@
 
     // 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() )
-        return;
+    if ( count( $wp_admin_bar->user->blogs ) < 1 && ! current_user_can( 'manage_network' ) ) {
+        return;
+    }
 
     if ( $wp_admin_bar->user->active_blog ) {
@@ -431 +433 @@
     ) );
 
-    if ( is_super_admin() ) {
+    if ( current_user_can( 'manage_network' ) ) {
         $wp_admin_bar->add_group( array(
             'parent' => 'my-sites',
@@ -487 +489 @@
         'id'     => 'my-sites-list',
         'meta'   => array(
-            'class' => is_super_admin() ? 'ab-sub-secondary' : '',
+            'class' => current_user_can( 'manage_network' ) ? 'ab-sub-secondary' : '',
         ),
     ) );