Applied patch in #590 by momo360modena and fixed a minor bug with blog searching

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1237 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 13 insertions, 12 deletions

diff --git a/wp-admin/users.php b/wp-admin/users.php
index c58e3f7..b4b2e9d 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -506,24 +506,25 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 
 <?php if( apply_filters('show_adduser_fields', true) ) {?>
 <div class="wrap">
-<h2 id="add-new-user"><?php _e('Add User From Community') ?></h2>
+<h2 id="add-new-user"><?php _e('Add user from community') ?></h2>
 <div class="narrow">
 <form action="" method="post" name="adduser" id="adduser">
 <?php wp_nonce_field('add-user') ?>
 <input type='hidden' name='action' value='addexistinguser'>
 <p><?php _e('Type the e-mail address of another user to add them to your blog.')?></p>
-<table>
-<tr><th scope="row"><?php _e('User&nbsp;E-Mail:')?> </th><td><input type="text" name="newuser" id="newuser"></td></tr>
-	<tr>
+
+<table class="form-table">
+	<tr class="form-field form-required">
+		<th scope="row"><?php _e('User&nbsp;E-Mail')?></th>
+		<td><input type="text" name="newuser" id="newuser" /></td>
+	</tr>
+	<tr class="form-field">
 		<th scope="row"><?php _e('Role:') ?></th>
-		<td><select name="new_role" id="new_role"><?php 
-		foreach($wp_roles->role_names as $role => $name) {
-			$selected = '';
-			if( $role == 'subscriber' )
-				$selected = 'selected="selected"';
-			echo "<option {$selected} value=\"{$role}\">{$name}</option>";
-		}
-		?></select></td>
+			<td>
+			<select name="new_role" id="new_role">
+				<?php wp_dropdown_roles('subscriber'); ?>
+			</select>
+		</td>
 	</tr>
 </table>
 <p class="submit">