WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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


git-svn-id: http://core.svn.wordpress.org/trunk@22418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-07 17:16:37 +00:00
parent 711f6f2619
commit fac33f51fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/capabilities.php
View File

@ -797,12 +797,12 @@ class WP_User {
* @param string $role Role name. * @param string $role Role name.
*/ */
function set_role( $role ) { function set_role( $role ) {
foreach ( (array) $this->roles as $oldrole )
unset( $this->caps[$oldrole] );
if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
return; return;
foreach ( (array) $this->roles as $oldrole )
unset( $this->caps[$oldrole] );
if ( !empty( $role ) ) { if ( !empty( $role ) ) {
$this->caps[$role] = true; $this->caps[$role] = true;
$this->roles = array( $role => true ); $this->roles = array( $role => true );