From fa76d11e93f9d890b9effcdbf45cceb4b9a4788c Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Mon, 19 Nov 2012 19:23:54 +0000
Subject: [PATCH] As wp_dropdown_roles() only prints editable roles, ensure
 that the "selected" role passed into it on the user-edit screen is editable.

props johnjamesjacoby. see #22361.



git-svn-id: http://core.svn.wordpress.org/trunk@22687 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 8c045abf3f..eadc1f08eb 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -249,10 +249,10 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <tr><th><label for="role"><?php _e('Role') ?></label></th>
 <td><select name="role" id="role">
 <?php
-// Get the highest/primary role for this user
+// Compare user role against currently editable roles
 // TODO: create a function that does this: wp_get_user_role()
-$user_roles = $profileuser->roles;
-$user_role = array_shift($user_roles);
+$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
+$user_role  = array_shift( $user_roles );
 
 // print the full list of roles with the primary one selected.
 wp_dropdown_roles($user_role);