Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 23:57:41 +02:00
Code Issues Projects Releases Wiki Activity

Users List Table: after [35011], just use wp_roles(), no global import. #winning

Browse Source 
See #22959.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-10 15:36:26 +00:00
parent ab2905da84
commit 57c2ef2655
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-wp-users-list-table.php
View File

@ -524,13 +524,11 @@ class WP_Users_List_Table extends WP_List_Table {
* @since 4.4.0 * @since 4.4.0
* @access protected * @access protected
* *
* @global WP_Roles $wp_roles WP_Roles instance.
*
* @param WP_User $user_object The WP_User object. * @param WP_User $user_object The WP_User object.
* @return array An array of user roles. * @return array An array of user roles.
*/ */
protected function get_role_list( $user_object ) { protected function get_role_list( $user_object ) {
global $wp_roles; $wp_roles = wp_roles();
$role_list = array(); $role_list = array();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-35011'; $wp_version = '4.4-alpha-35012';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.