Changeset 22418

Timestamp:

11/07/2012 05:16:37 PM (14 years ago)

Author:

ryan

Message:

When using WP_User::set_role() to set the role, don't unset all caps when the requested role matches the current role.

Props scribu, jammitch
fixes #18932

File:

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

trunk/wp-includes/capabilities.php

@@ -798 +798 @@
          */
         function set_role( $role ) {
+                if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+                        return;
+
                 foreach ( (array) $this->roles as $oldrole )
                         unset( $this->caps[$oldrole] );
-
-                if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
-                        return;
 
                 if ( !empty( $role ) ) {