Ticket #12815: 12815.diff

wp-includes/capabilities.php

@@ -1159 +1159 @@
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
+        global $site_admins;
+
         if ( ! $user_id ) {
                 $current_user = wp_get_current_user();
                 $user_id = ! empty($current_user) ? $current_user->id : 0;
@@ -1170 +1172 @@
         $user = new WP_User($user_id);
 
         if ( is_multisite() ) {
-                $site_admins = get_site_option( 'site_admins', array('admin') );
-                if ( is_array( $site_admins ) && in_array( $user->user_login, $site_admins ) )
+                if ( isset($site_admins) )
+                        $super_admins = $site_admins;
+                else
+                        $super_admins = get_site_option( 'site_admins', array('admin') );
+
+                if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
                         return true;
         } else {
                 if ( $user->has_cap('delete_users') )