From 57c2ef26556f61d637f19a6d5fce905e21b5d4a3 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 10 Oct 2015 15:36:26 +0000 Subject: [PATCH] Users List Table: after [35011], just use `wp_roles()`, no global import. #winning 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 --- wp-admin/includes/class-wp-users-list-table.php | 4 +--- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 4b60000205..b3a8d95aa8 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -524,13 +524,11 @@ class WP_Users_List_Table extends WP_List_Table { * @since 4.4.0 * @access protected * - * @global WP_Roles $wp_roles WP_Roles instance. - * * @param WP_User $user_object The WP_User object. * @return array An array of user roles. */ protected function get_role_list( $user_object ) { - global $wp_roles; + $wp_roles = wp_roles(); $role_list = array(); diff --git a/wp-includes/version.php b/wp-includes/version.php index 25db95affa..8268d80a18 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.