From 75c4cb98f49fffa8d17cb00c2d60c151c90c4029 Mon Sep 17 00:00:00 2001
From: Felix Arntz <flixos90@git.wordpress.org>
Date: Sat, 30 Sep 2017 03:19:26 +0000
Subject: [PATCH] Multisite: Display correct roles in Network > Site Users
 screen for sites other than the main site.

Props jeremyfelt.
Fixes #42013.


git-svn-id: https://develop.svn.wordpress.org/trunk@41652 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/network/site-users.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 68cc29c723..95db765751 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -298,7 +298,11 @@ if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us
 		<tr>
 			<th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th>
 			<td><select name="new_role" id="new_role_adduser">
-			<?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
+			<?php
+			switch_to_blog( $id );
+			wp_dropdown_roles( get_option( 'default_role' ) );
+			restore_current_blog();
+			?>
 			</select></td>
 		</tr>
 	</table>
@@ -331,7 +335,11 @@ if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use
 		<tr>
 			<th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th>
 			<td><select name="new_role" id="new_role_newuser">
-			<?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
+			<?php
+			switch_to_blog( $id );
+			wp_dropdown_roles( get_option( 'default_role' ) );
+			restore_current_blog();
+			?>
 			</select></td>
 		</tr>
 		<tr class="form-field">