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

`WP_User::get_role_caps()` now returns the caps it was already setting. The method was previously just setting `$allprops` and requiring that property to be read. 

Props nofearinc.
Fixes #24962.



Built from https://develop.svn.wordpress.org/trunk@25673


git-svn-id: http://core.svn.wordpress.org/trunk@25589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2013-10-02 21:36:09 +00:00
parent e230a71bdb
commit 80bac8fe09
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/capabilities.php
View File

@ -732,6 +732,8 @@ class WP_User {
* @since 2.0.0 * @since 2.0.0
* @uses $wp_roles * @uses $wp_roles
* @access public * @access public
*
* @return array List of all capabilities for the user.
*/ */
function get_role_caps() { function get_role_caps() {
global $wp_roles; global $wp_roles;
@ -750,6 +752,8 @@ class WP_User {
$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities ); $this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
} }
$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps ); $this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
return $this->allcaps;
} }
/** /**