WordPress 4.0

[autoinstalls/wordpress.git] / wp-admin / network / site-users.php

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 88476068064a08d975929a2306797091ad2ded60..a037c8b8710efa388159220f706e33a13861b282 100644 (file)
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -33,12 +33,16 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
 $referer = remove_query_arg( 'update', wp_get_referer() );
 
+if ( ! empty( $_REQUEST['paged'] ) ) {
+       $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
+}
+
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
 if ( ! $id )
@@ -52,10 +56,6 @@ $is_main_site = is_main_site( $id );
 
 switch_to_blog( $id );
 
-$editblog_roles = $wp_roles->roles;
-
-$default_role = get_option( 'default_role' );
-
 $action = $wp_list_table->current_action();
 
 if ( $action ) {
@@ -176,7 +176,7 @@ if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users
 
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
-<script type='text/javascript'>
+<script type="text/javascript">
 /* <![CDATA[ */
 var current_site_id = <?php echo $id; ?>;
 /* ]]> */
@@ -270,13 +270,7 @@ if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us
                <tr>
                        <th scope="row"><?php _e( 'Role' ); ?></th>
                        <td><select name="new_role" id="new_role_0">
-                       <?php
-                       reset( $editblog_roles );
-                       foreach ( $editblog_roles as $role => $role_assoc ) {
-                               $name = translate_user_role( $role_assoc['name'] );
-                               echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
-                       }
-                       ?>
+                       <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
                        </select></td>
                </tr>
        </table>
@@ -309,13 +303,7 @@ if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use
                <tr>
                        <th scope="row"><?php _e( 'Role' ); ?></th>
                        <td><select name="new_role" id="new_role_0">
-                       <?php
-                       reset( $editblog_roles );
-                       foreach ( $editblog_roles as $role => $role_assoc ) {
-                               $name = translate_user_role( $role_assoc['name'] );
-                               echo '<option ' . selected( $default_role, $role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
-                       }
-                       ?>
+                       <?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
                        </select></td>
                </tr>
                <tr class="form-field">