From b692a1f3228c8f6c0fa5657afb34eb4a628a98f6 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 20 Apr 2009 20:03:20 +0000 Subject: [PATCH] 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 --- wp-includes/capabilities.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index a40d0a5801..cccd68daba 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -534,9 +534,9 @@ class WP_User { $this->allcaps = array(); foreach ( (array) $this->roles as $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 ); } /**