diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 3a931bee2d..ffbfac7da9 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -16,64 +16,65 @@ class WP_Roles {
 		global $wpdb;
 		global $wp_user_roles;
 		$this->role_key = $wpdb->prefix . 'user_roles';
-		if ( ! empty($wp_user_roles) ) {
+		if ( ! empty( $wp_user_roles ) ) {
 			$this->roles = $wp_user_roles;
 			$this->use_db = false;
 		} else {
-			$this->roles = get_option($this->role_key);
+			$this->roles = get_option( $this->role_key );
 		}
 
-		if ( empty($this->roles) )
+		if ( empty( $this->roles ) )
 			return;
 
 		$this->role_objects = array();
 		$this->role_names =  array();
-		foreach ( (array) $this->roles as $role => $data) {
-			$this->role_objects[$role] = new WP_Role($role, $this->roles[$role]['capabilities']);
+		foreach ( (array) $this->roles as $role => $data ) {
+			$this->role_objects[$role] = new WP_Role( $role, $this->roles[$role]['capabilities'] );
 			$this->role_names[$role] = $this->roles[$role]['name'];
 		}
 	}
 
-	function add_role($role, $display_name, $capabilities = array()) {
-		if ( isset($this->roles[$role]) )
+	function add_role( $role, $display_name, $capabilities = array() ) {
+		if ( isset( $this->roles[$role] ) )
 			return;
 
 		$this->roles[$role] = array(
 			'name' => $display_name,
-			'capabilities' => $capabilities);
+			'capabilities' => $capabilities
+			);
 		if ( $this->use_db )
-			update_option($this->role_key, $this->roles);
-		$this->role_objects[$role] = new WP_Role($role, $capabilities);
+			update_option( $this->role_key, $this->roles );
+		$this->role_objects[$role] = new WP_Role( $role, $capabilities );
 		$this->role_names[$role] = $display_name;
 		return $this->role_objects[$role];
 	}
 
-	function remove_role($role) {
-		if ( ! isset($this->role_objects[$role]) )
+	function remove_role( $role ) {
+		if ( ! isset( $this->role_objects[$role] ) )
 			return;
 
-		unset($this->role_objects[$role]);
-		unset($this->role_names[$role]);
-		unset($this->roles[$role]);
+		unset( $this->role_objects[$role] );
+		unset( $this->role_names[$role] );
+		unset( $this->roles[$role] );
 
 		if ( $this->use_db )
-			update_option($this->role_key, $this->roles);
+			update_option( $this->role_key, $this->roles );
 	}
 
-	function add_cap($role, $cap, $grant = true) {
+	function add_cap( $role, $cap, $grant = true ) {
 		$this->roles[$role]['capabilities'][$cap] = $grant;
 		if ( $this->use_db )
-			update_option($this->role_key, $this->roles);
+			update_option( $this->role_key, $this->roles );
 	}
 
-	function remove_cap($role, $cap) {
-		unset($this->roles[$role]['capabilities'][$cap]);
+	function remove_cap( $role, $cap ) {
+		unset( $this->roles[$role]['capabilities'][$cap] );
 		if ( $this->use_db )
-			update_option($this->role_key, $this->roles);
+			update_option( $this->role_key, $this->roles );
 	}
 
-	function &get_role($role) {
-		if ( isset($this->role_objects[$role]) )
+	function &get_role( $role ) {
+		if ( isset( $this->role_objects[$role] ) )
 			return $this->role_objects[$role];
 		else
 			return null;
@@ -83,9 +84,9 @@ class WP_Roles {
 		return $this->role_names;
 	}
 
-	function is_role($role)
+	function is_role( $role )
 	{
-		return isset($this->role_names[$role]);
+		return isset( $this->role_names[$role] );
 	}
 }
 
@@ -93,34 +94,34 @@ class WP_Role {
 	var $name;
 	var $capabilities;
 
-	function WP_Role($role, $capabilities) {
+	function WP_Role( $role, $capabilities ) {
 		$this->name = $role;
 		$this->capabilities = $capabilities;
 	}
 
-	function add_cap($cap, $grant = true) {
+	function add_cap( $cap, $grant = true ) {
 		global $wp_roles;
 
-		if ( ! isset($wp_roles) )
+		if ( ! isset( $wp_roles ) )
 			$wp_roles = new WP_Roles();
 
 		$this->capabilities[$cap] = $grant;
-		$wp_roles->add_cap($this->name, $cap, $grant);
+		$wp_roles->add_cap( $this->name, $cap, $grant );
 	}
 
-	function remove_cap($cap) {
+	function remove_cap( $cap ) {
 		global $wp_roles;
 
-		if ( ! isset($wp_roles) )
+		if ( ! isset( $wp_roles ) )
 			$wp_roles = new WP_Roles();
 
-		unset($this->capabilities[$cap]);
-		$wp_roles->remove_cap($this->name, $cap);
+		unset( $this->capabilities[$cap] );
+		$wp_roles->remove_cap( $this->name, $cap );
 	}
 
-	function has_cap($cap) {
-		$capabilities = apply_filters('role_has_cap', $this->capabilities, $cap, $this->name);
-		if ( !empty($capabilities[$cap]) )
+	function has_cap( $cap ) {
+		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
+		if ( !empty( $capabilities[$cap] ) )
 			return $capabilities[$cap];
 		else
 			return false;
@@ -137,25 +138,25 @@ class WP_User {
 	var $roles = array();
 	var $allcaps = array();
 
-	function WP_User($id, $name = '') {
+	function WP_User( $id, $name = '' ) {
 
-		if ( empty($id) && empty($name) )
+		if ( empty( $id ) && empty( $name ) )
 			return;
 
-		if ( ! is_numeric($id) ) {
+		if ( ! is_numeric( $id ) ) {
 			$name = $id;
 			$id = 0;
 		}
 
-		if ( ! empty($id) )
-			$this->data = get_userdata($id);
+		if ( ! empty( $id ) )
+			$this->data = get_userdata( $id );
 		else
-			$this->data = get_userdatabylogin($name);
+			$this->data = get_userdatabylogin( $name );
 
-		if ( empty($this->data->ID) )
+		if ( empty( $this->data->ID ) )
 			return;
 
-		foreach (get_object_vars($this->data) as $key => $value) {
+		foreach ( get_object_vars( $this->data ) as $key => $value ) {
 			$this->{$key} = $value;
 		}
 
@@ -167,7 +168,7 @@ class WP_User {
 		global $wpdb;
 		$this->cap_key = $wpdb->prefix . 'capabilities';
 		$this->caps = &$this->{$this->cap_key};
-		if ( ! is_array($this->caps) )
+		if ( ! is_array( $this->caps ) )
 			$this->caps = array();
 		$this->get_role_caps();
 	}
@@ -175,55 +176,55 @@ class WP_User {
 	function get_role_caps() {
 		global $wp_roles;
 
-		if ( ! isset($wp_roles) )
+		if ( ! isset( $wp_roles ) )
 			$wp_roles = new WP_Roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if(is_array($this->caps))
-			$this->roles = array_filter(array_keys($this->caps), array(&$wp_roles, 'is_role'));
+		if ( is_array( $this->caps ) )
+			$this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
-		foreach( (array) $this->roles as $role) {
-			$role = $wp_roles->get_role($role);
-			$this->allcaps = array_merge($this->allcaps, $role->capabilities);
+		foreach ( (array) $this->roles as $role ) {
+			$role = $wp_roles->get_role( $role );
+			$this->allcaps = array_merge( $this->allcaps, $role->capabilities );
 		}
-		$this->allcaps = array_merge($this->allcaps, $this->caps);
+		$this->allcaps = array_merge( $this->allcaps, $this->caps );
 	}
 
-	function add_role($role) {
+	function add_role( $role ) {
 		$this->caps[$role] = true;
-		update_usermeta($this->ID, $this->cap_key, $this->caps);
+		update_usermeta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
 
-	function remove_role($role) {
-		if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
+	function remove_role( $role ) {
+		if ( empty( $this->roles[$role] ) || ( count( $this->roles ) <= 1 ) )
 			return;
-		unset($this->caps[$role]);
-		update_usermeta($this->ID, $this->cap_key, $this->caps);
+		unset( $this->caps[$role] );
+		update_usermeta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 	}
 
-	function set_role($role) {
-		foreach( (array) $this->roles as $oldrole)
-			unset($this->caps[$oldrole]);
-		if ( !empty($role) ) {
+	function set_role( $role ) {
+		foreach ( (array) $this->roles as $oldrole )
+			unset( $this->caps[$oldrole] );
+		if ( !empty( $role ) ) {
 			$this->caps[$role] = true;
-			$this->roles = array($role => true);
+			$this->roles = array( $role => true );
 		} else {
 			$this->roles = false;
 		}
-		update_usermeta($this->ID, $this->cap_key, $this->caps);
+		update_usermeta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
 
-	function level_reduction($max, $item) {
-		if(preg_match('/^level_(10|[0-9])$/i', $item, $matches)) {
-			$level = intval($matches[1]);
-			return max($max, $level);
+	function level_reduction( $max, $item ) {
+		if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
+			$level = intval( $matches[1] );
+			return max( $max, $level );
 		} else {
 			return $max;
 		}
@@ -231,83 +232,83 @@ class WP_User {
 
 	function update_user_level_from_caps() {
 		global $wpdb;
-		$this->user_level = array_reduce(array_keys($this->allcaps), 	array(&$this, 'level_reduction'), 0);
-		update_usermeta($this->ID, $wpdb->prefix.'user_level', $this->user_level);
+		$this->user_level = array_reduce( array_keys( $this->allcaps ), array( &$this, 'level_reduction' ), 0 );
+		update_usermeta( $this->ID, $wpdb->prefix.'user_level', $this->user_level );
 	}
 
-	function add_cap($cap, $grant = true) {
+	function add_cap( $cap, $grant = true ) {
 		$this->caps[$cap] = $grant;
-		update_usermeta($this->ID, $this->cap_key, $this->caps);
+		update_usermeta( $this->ID, $this->cap_key, $this->caps );
 	}
 
-	function remove_cap($cap) {
-		if ( empty($this->caps[$cap]) ) return;
-		unset($this->caps[$cap]);
-		update_usermeta($this->ID, $this->cap_key, $this->caps);
+	function remove_cap( $cap ) {
+		if ( empty( $this->caps[$cap] ) ) return;
+		unset( $this->caps[$cap] );
+		update_usermeta( $this->ID, $this->cap_key, $this->caps );
 	}
 
 	function remove_all_caps() {
 		global $wpdb;
 		$this->caps = array();
-		update_usermeta($this->ID, $this->cap_key, '');
-		update_usermeta($this->ID, $wpdb->prefix.'user_level', '');
+		update_usermeta( $this->ID, $this->cap_key, '' );
+		update_usermeta( $this->ID, $wpdb->prefix.'user_level', '' );
 		$this->get_role_caps();
 	}
 
-	//has_cap(capability_or_role_name) or
-	//has_cap('edit_post', post_id)
-	function has_cap($cap) {
-		if ( is_numeric($cap) )
-			$cap = $this->translate_level_to_cap($cap);
+	// has_cap( capability_or_role_name ) or
+	// has_cap( 'edit_post', post_id )
+	function has_cap( $cap ) {
+		if ( is_numeric( $cap ) )
+			$cap = $this->translate_level_to_cap( $cap );
 
-		$args = array_slice(func_get_args(), 1);
-		$args = array_merge(array($cap, $this->ID), $args);
-		$caps = call_user_func_array('map_meta_cap', $args);
+		$args = array_slice( func_get_args(), 1 );
+		$args = array_merge( array( $cap, $this->ID ), $args );
+		$caps = call_user_func_array( 'map_meta_cap', $args );
 		// Must have ALL requested caps
-		$capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args);
-		foreach ( (array) $caps as $cap) {
+		$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
+		foreach ( (array) $caps as $cap ) {
 			//echo "Checking cap $cap<br />";
-			if(empty($capabilities[$cap]) || !$capabilities[$cap])
+			if ( empty( $capabilities[$cap] ) || !$capabilities[$cap] )
 				return false;
 		}
 
 		return true;
 	}
 
-	function translate_level_to_cap($level) {
+	function translate_level_to_cap( $level ) {
 		return 'level_' . $level;
 	}
 
 }
 
 // Map meta capabilities to primitive capabilities.
-function map_meta_cap($cap, $user_id) {
-	$args = array_slice(func_get_args(), 2);
+function map_meta_cap( $cap, $user_id ) {
+	$args = array_slice( func_get_args(), 2 );
 	$caps = array();
 
-	switch ($cap) {
+	switch ( $cap ) {
 	case 'delete_user':
 		$caps[] = 'delete_users';
 		break;
 	case 'edit_user':
-		if ( !isset($args[0]) || $user_id != $args[0] ) {
+		if ( !isset( $args[0] ) || $user_id != $args[0] ) {
 			$caps[] = 'edit_users';
 		}
 		break;
 	case 'delete_post':
-		$author_data = get_userdata($user_id);
+		$author_data = get_userdata( $user_id );
 		//echo "post ID: {$args[0]}<br />";
-		$post = get_post($args[0]);
+		$post = get_post( $args[0] );
 		if ( 'page' == $post->post_type ) {
-			$args = array_merge(array('delete_page', $user_id), $args);
-			return call_user_func_array('map_meta_cap', $args);
+			$args = array_merge( array( 'delete_page', $user_id ), $args );
+			return call_user_func_array( 'map_meta_cap', $args );
 		}
-		$post_author_data = get_userdata($post->post_author);
+		$post_author_data = get_userdata( $post->post_author );
 		//echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
 		// If the user is the author...
-		if ($user_id == $post_author_data->ID) {
+		if ( $user_id == $post_author_data->ID ) {
 			// If the post is published...
-			if ($post->post_status == 'publish')
+			if ( 'publish' == $post->post_status )
 				$caps[] = 'delete_published_posts';
 			else
 				// If the post is draft...
@@ -316,22 +317,22 @@ function map_meta_cap($cap, $user_id) {
 			// The user is trying to edit someone else's post.
 			$caps[] = 'delete_others_posts';
 			// The post is published, extra cap required.
-			if ($post->post_status == 'publish')
+			if ( 'publish' == $post->post_status )
 				$caps[] = 'delete_published_posts';
-			else if ($post->post_status == 'private')
+			elseif ( 'private' == $post->post_status )
 				$caps[] = 'delete_private_posts';
 		}
 		break;
 	case 'delete_page':
-		$author_data = get_userdata($user_id);
+		$author_data = get_userdata( $user_id );
 		//echo "post ID: {$args[0]}<br />";
-		$page = get_page($args[0]);
-		$page_author_data = get_userdata($page->post_author);
+		$page = get_page( $args[0] );
+		$page_author_data = get_userdata( $page->post_author );
 		//echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
 		// If the user is the author...
-		if ($user_id == $page_author_data->ID) {
+		if ( $user_id == $page_author_data->ID ) {
 			// If the page is published...
-			if ($page->post_status == 'publish')
+			if ( $page->post_status == 'publish' )
 				$caps[] = 'delete_published_pages';
 			else
 				// If the page is draft...
@@ -340,28 +341,28 @@ function map_meta_cap($cap, $user_id) {
 			// The user is trying to edit someone else's page.
 			$caps[] = 'delete_others_pages';
 			// The page is published, extra cap required.
-			if ($page->post_status == 'publish')
+			if ( $page->post_status == 'publish' )
 				$caps[] = 'delete_published_pages';
-			else if ($page->post_status == 'private')
+			elseif ( $page->post_status == 'private' )
 				$caps[] = 'delete_private_pages';
 		}
 		break;
 		// edit_post breaks down to edit_posts, edit_published_posts, or
 		// edit_others_posts
 	case 'edit_post':
-		$author_data = get_userdata($user_id);
+		$author_data = get_userdata( $user_id );
 		//echo "post ID: {$args[0]}<br />";
-		$post = get_post($args[0]);
+		$post = get_post( $args[0] );
 		if ( 'page' == $post->post_type ) {
-			$args = array_merge(array('edit_page', $user_id), $args);
-			return call_user_func_array('map_meta_cap', $args);
+			$args = array_merge( array( 'edit_page', $user_id ), $args );
+			return call_user_func_array( 'map_meta_cap', $args );
 		}
-		$post_author_data = get_userdata($post->post_author);
+		$post_author_data = get_userdata( $post->post_author );
 		//echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
 		// If the user is the author...
-		if ($user_id == $post_author_data->ID) {
+		if ( $user_id == $post_author_data->ID ) {
 			// If the post is published...
-			if ($post->post_status == 'publish')
+			if ( 'publish' == $post->post_status )
 				$caps[] = 'edit_published_posts';
 			else
 				// If the post is draft...
@@ -370,22 +371,22 @@ function map_meta_cap($cap, $user_id) {
 			// The user is trying to edit someone else's post.
 			$caps[] = 'edit_others_posts';
 			// The post is published, extra cap required.
-			if ($post->post_status == 'publish')
+			if ( 'publish' == $post->post_status )
 				$caps[] = 'edit_published_posts';
-			else if ($post->post_status == 'private')
+			elseif ( 'private' == $post->post_status )
 				$caps[] = 'edit_private_posts';
 		}
 		break;
 	case 'edit_page':
-		$author_data = get_userdata($user_id);
+		$author_data = get_userdata( $user_id );
 		//echo "post ID: {$args[0]}<br />";
-		$page = get_page($args[0]);
-		$page_author_data = get_userdata($page->post_author);
+		$page = get_page( $args[0] );
+		$page_author_data = get_userdata( $page->post_author );
 		//echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
 		// If the user is the author...
-		if ($user_id == $page_author_data->ID) {
+		if ( $user_id == $page_author_data->ID ) {
 			// If the page is published...
-			if ($page->post_status == 'publish')
+			if ( 'publish' == $page->post_status )
 				$caps[] = 'edit_published_pages';
 			else
 				// If the page is draft...
@@ -394,17 +395,17 @@ function map_meta_cap($cap, $user_id) {
 			// The user is trying to edit someone else's page.
 			$caps[] = 'edit_others_pages';
 			// The page is published, extra cap required.
-			if ($page->post_status == 'publish')
+			if ( 'publish' == $page->post_status )
 				$caps[] = 'edit_published_pages';
-			else if ($page->post_status == 'private')
+			elseif ( 'private' == $page->post_status )
 				$caps[] = 'edit_private_pages';
 		}
 		break;
 	case 'read_post':
-		$post = get_post($args[0]);
+		$post = get_post( $args[0] );
 		if ( 'page' == $post->post_type ) {
-			$args = array_merge(array('read_page', $user_id), $args);
-			return call_user_func_array('map_meta_cap', $args);
+			$args = array_merge( array( 'read_page', $user_id ), $args );
+			return call_user_func_array( 'map_meta_cap', $args );
 		}
 
 		if ( 'private' != $post->post_status ) {
@@ -412,24 +413,24 @@ function map_meta_cap($cap, $user_id) {
 			break;
 		}
 
-		$author_data = get_userdata($user_id);
-		$post_author_data = get_userdata($post->post_author);
-		if ($user_id == $post_author_data->ID)
+		$author_data = get_userdata( $user_id );
+		$post_author_data = get_userdata( $post->post_author );
+		if ( $user_id == $post_author_data->ID )
 			$caps[] = 'read';
 		else
 			$caps[] = 'read_private_posts';
 		break;
 	case 'read_page':
-		$page = get_page($args[0]);
+		$page = get_page( $args[0] );
 
 		if ( 'private' != $page->post_status ) {
 			$caps[] = 'read';
 			break;
 		}
 
-		$author_data = get_userdata($user_id);
-		$page_author_data = get_userdata($page->post_author);
-		if ($user_id == $page_author_data->ID)
+		$author_data = get_userdata( $user_id );
+		$page_author_data = get_userdata( $page->post_author );
+		if ( $user_id == $page_author_data->ID )
 			$caps[] = 'read';
 		else
 			$caps[] = 'read_private_pages';
@@ -443,44 +444,44 @@ function map_meta_cap($cap, $user_id) {
 }
 
 // Capability checking wrapper around the global $current_user object.
-function current_user_can($capability) {
+function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty($current_user) )
+	if ( empty( $current_user ) )
 		return false;
 
-	$args = array_slice(func_get_args(), 1);
-	$args = array_merge(array($capability), $args);
+	$args = array_slice( func_get_args(), 1 );
+	$args = array_merge( array( $capability ), $args );
 
-	return call_user_func_array(array(&$current_user, 'has_cap'), $args);
+	return call_user_func_array( array( &$current_user, 'has_cap' ), $args );
 }
 
 // Convenience wrappers around $wp_roles.
-function get_role($role) {
+function get_role( $role ) {
 	global $wp_roles;
 
-	if ( ! isset($wp_roles) )
+	if ( ! isset( $wp_roles ) )
 		$wp_roles = new WP_Roles();
 
-	return $wp_roles->get_role($role);
+	return $wp_roles->get_role( $role );
 }
 
-function add_role($role, $display_name, $capabilities = array()) {
+function add_role( $role, $display_name, $capabilities = array() ) {
 	global $wp_roles;
 
-	if ( ! isset($wp_roles) )
+	if ( ! isset( $wp_roles ) )
 		$wp_roles = new WP_Roles();
 
-	return $wp_roles->add_role($role, $display_name, $capabilities);
+	return $wp_roles->add_role( $role, $display_name, $capabilities );
 }
 
-function remove_role($role) {
+function remove_role( $role ) {
 	global $wp_roles;
 
-	if ( ! isset($wp_roles) )
+	if ( ! isset( $wp_roles ) )
 		$wp_roles = new WP_Roles();
 
-	return $wp_roles->remove_role($role);
+	return $wp_roles->remove_role( $role );
 }
 
 ?>