Ticket #14756: 14756.4.diff

wp-admin/network/site-users.php

@@ -270 +270 @@
                         <th scope="row"><?php _e( 'Role'); ?></th>
                         <td><select name="new_role" id="new_role_0">
                         <?php
+                        if ( !isset( $default_role ) )
+                                $default_role = $wpdb->get_var( "SELECT `option_value` FROM {$blog_prefix}options WHERE option_name = 'default_role'" );
                         reset( $editblog_roles );
                         foreach ( $editblog_roles as $role => $role_assoc ){
                                 $name = translate_user_role( $role_assoc['name'] );
@@ -286 +288 @@
         <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
         <?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
 </form>
+<?php endif; ?>
 </div>
-<?php endif; ?>
 <?php
 require('../admin-footer.php');
- No newline at end of file