Cast to array to fix warning. Props johnkolbert, Denis-de-Bernardy. fixes #9128

git-svn-id: http://svn.automattic.com/wordpress/trunk@11019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-20 20:03:20 +00:00
parent 3d15f1aad4
commit b692a1f322
1 changed files with 2 additions and 2 deletions

View File

@ -534,9 +534,9 @@ class WP_User {
$this->allcaps = array(); $this->allcaps = array();
foreach ( (array) $this->roles as $role ) { foreach ( (array) $this->roles as $role ) {
$role =& $wp_roles->get_role( $role ); $role =& $wp_roles->get_role( $role );
$this->allcaps = array_merge( $this->allcaps, $role->capabilities ); $this->allcaps = array_merge( (array) $this->allcaps, (array) $role->capabilities );
} }
$this->allcaps = array_merge( $this->allcaps, $this->caps ); $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
} }
/** /**