From 6ff82f54e77fd7d8d22d416826bba40cabb0cdf9 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 21 Mar 2010 01:36:54 +0000
Subject: [PATCH] Fix WP_User::remove_role(). See #10285

git-svn-id: http://svn.automattic.com/wordpress/trunk@13784 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/capabilities.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index fb6315a12..366de783c 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -581,11 +581,12 @@ class WP_User {
 	 * @param string $role Role name.
 	 */
 	function remove_role( $role ) {
-		if ( empty( $this->roles[$role] ) || ( count( $this->roles ) <= 1 ) )
+		if ( !in_array($role, $this->roles) )
 			return;
 		unset( $this->caps[$role] );
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
+		$this->update_user_level_from_caps();
 	}
 
 	/**