Changeset 11019

Timestamp:

04/20/2009 08:03:20 PM (17 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/capabilities.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -535 +535 @@
                 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( (array) $this->allcaps, (array) $role->capabilities );
+                }
+                $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
         }