From b0aaa16b320e043033fd6e9f6c3b2d6b4311eff5 Mon Sep 17 00:00:00 2001
From: Felix Arntz <felix-arntz@leaves-and-love.net>
Date: Sat, 30 Sep 2017 03:20:46 +0000
Subject: [PATCH] Multisite: Display correct roles in Network > Site Users
 screen for sites other than the main site.

Props jeremyfelt.
Fixes #42013.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-users.php | 12 ++++++++++--
 wp-includes/version.php         |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 68cc29c723..95db765751 100644
--- a/wp-admin/network/site-users.php
+++ b/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">
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5066e46c85..bd25b76da0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41651';
+$wp_version = '4.9-alpha-41652';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.