Changeset 12479

Timestamp:

12/22/2009 11:42:46 AM (17 years ago)

Author:

westi

Message:

Ensure we don't destory the $wp_roles->role_objects property when assigning a second role to a WP_User object. Fixes #9128 props dd32.

File:

• trunk/wp-includes/capabilities.php (modified) (6 diffs)

trunk/wp-includes/capabilities.php

@@ -98 +98 @@
          */
         function _init () {
-                global $wpdb;
-                global $wp_user_roles;
+                global $wpdb, $wp_user_roles;
                 $this->role_key = $wpdb->prefix . 'user_roles';
                 if ( ! empty( $wp_user_roles ) ) {
@@ -546 +545 @@
                 $this->allcaps = array();
                 foreach ( (array) $this->roles as $role ) {
-                        $role =& $wp_roles->get_role( $role );
-                        $this->allcaps = array_merge( (array) $this->allcaps, (array) $role->capabilities );
+                        $the_role =& $wp_roles->get_role( $role );
+                        $this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
                 }
                 $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
@@ -653 +652 @@
                 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 );
+                update_usermeta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
         }
 
@@ -679 +678 @@
          */
         function remove_cap( $cap ) {
-                if ( empty( $this->caps[$cap] ) ) return;
+                if ( empty( $this->caps[$cap] ) )
+                        return;
                 unset( $this->caps[$cap] );
                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
@@ -694 +694 @@
                 $this->caps = array();
                 update_usermeta( $this->ID, $this->cap_key, '' );
-                update_usermeta( $this->ID, $wpdb->prefix.'user_level', '' );
+                update_usermeta( $this->ID, $wpdb->prefix . 'user_level', '' );
                 $this->get_role_caps();
         }
@@ -783 +783 @@
                 }
 
-                if ('' != $post->post_author) {
+                if ( '' != $post->post_author ) {
                         $post_author_data = get_userdata( $post->post_author );
                 } else {