Roles are in values, not keys.

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

2 files changed, 2 insertions, 2 deletions

diff --git a/wp-inst/wp-admin/user-edit.php b/wp-inst/wp-admin/user-edit.php
index 6576040..6060f1b 100644
--- a/wp-inst/wp-admin/user-edit.php
+++ b/wp-inst/wp-admin/user-edit.php
@@ -144,7 +144,7 @@ if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permi
 		<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 = (empty($wp_user->roles[$role])) ? '' : 'selected="selected"';
+			$selected = ( $role != $wp_user->roles[0] ) ? '' : 'selected="selected"';
 			echo "<option {$selected} value=\"{$role}\">{$name}</option>";
 		}
 		?></select></td>
diff --git a/wp-inst/wp-admin/users.php b/wp-inst/wp-admin/users.php
index 963cbe8..d6897e9 100644
--- a/wp-inst/wp-admin/users.php
+++ b/wp-inst/wp-admin/users.php
@@ -182,7 +182,7 @@ default:
 	
 	foreach($userids as $userid) {
 		$tmp_user = new WP_User($userid);
-		$roles = array_keys($tmp_user->roles);
+		$roles = array_values($tmp_user->roles);
 		$role = $roles[0];
 		if( $role == '' )
 		    $role = 'inactive';