From 5e3fd53b7a497b53405b45f3eaa167669707217d Mon Sep 17 00:00:00 2001
From: PeteMall <PeteMall@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 24 Nov 2010 08:06:38 +0000
Subject: [PATCH] Ignore role selector in network admin user-edit. See #14435.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index e7a756eb9d..f255c6a72d 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -131,7 +131,7 @@ if ( !is_multisite() ) {
 	$blog_prefix = $wpdb->get_blog_prefix();
 	if ( $user_id != $current_user->ID ) {
 		$cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" );
-		if ( null == $cap && $_POST[ 'role' ] == '' ) {
+		if ( !is_network_admin() && null == $cap && $_POST[ 'role' ] == '' ) {
 			$_POST[ 'role' ] = 'contributor';
 			$delete_role = true;
 		}