From bff2814d07595efa9d97e8d9d12d1d03babecf07 Mon Sep 17 00:00:00 2001 From: Ron Rennick Date: Sat, 27 Feb 2010 18:07:25 +0000 Subject: [PATCH] warnings cleanup edit user, props dd32, see #12387 git-svn-id: https://develop.svn.wordpress.org/trunk@13463 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/user.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 86ee805871..4b0821d20d 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -76,8 +76,9 @@ function edit_user( $user_id = 0 ) { if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { $new_role = sanitize_text_field( $_POST['role'] ); + $potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false; // Don't let anyone with 'edit_users' (admins) edit their own role to something without it. - if( $user_id != $current_user->id || $wp_roles->role_objects[$new_role]->has_cap( 'edit_users' )) + if ( $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) ) $user->role = $new_role; // If the new role isn't editable by the logged-in user die with error