Ticket #40406: 40406.diff

src/wp-admin/includes/schema.php

@@ -951 +951 @@
 
         if ( !is_multisite() ) {
                 $site_admins = array( $site_user->user_login );
-                $users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
+                $users = get_users( array(
+                        'fields' => array( 'ID', 'user_login' ),
+                        'role'   => 'administrator',
+                ) );
                 if ( $users ) {
                         foreach ( $users as $user ) {
-                                if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
-                                        $site_admins[] = $user->user_login;
+                                $site_admins[] = $user->user_login;
                         }
+
+                        $site_admins = array_unique( $site_admins );
                 }
         } else {
                 $site_admins = get_site_option( 'site_admins' );