Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 18:08:09 +01:00
Code Issues Projects Releases Wiki Activity

Multisite: Display correct roles in Network > Site Users screen for sites other than the main site.

Browse Source 
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
This commit is contained in:
Felix Arntz 2017-09-30 03:20:46 +00:00
parent e0c3951b08
commit b0aaa16b32
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/network/site-users.php
View File

@ -298,7 +298,11 @@ if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us
<tr> <tr>
<th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th> <th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th>
<td><select name="new_role" id="new_role_adduser"> <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> </select></td>
</tr> </tr>
</table> </table>
@ -331,7 +335,11 @@ if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use
<tr> <tr>
<th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th> <th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th>
<td><select name="new_role" id="new_role_newuser"> <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> </select></td>
</tr> </tr>
<tr class="form-field"> <tr class="form-field">

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.