From ab2905da841d2934201c04a49df7e2bf906bba93 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 10 Oct 2015 15:26:24 +0000 Subject: [PATCH] Users List Table: after [34963], remove unused code/add doc for global import. See #22959. Built from https://develop.svn.wordpress.org/trunk@35011 git-svn-id: http://core.svn.wordpress.org/trunk@34976 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-users-list-table.php | 5 ++--- wp-includes/version.php | 2 +- 2 files changed, 3 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 cf530057f0..4b60000205 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -374,8 +374,6 @@ class WP_Users_List_Table extends WP_List_Table { * @return string Output for a single row. */ public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { - $wp_roles = wp_roles(); - if ( ! ( $user_object instanceof WP_User ) ) { $user_object = get_userdata( (int) $user_object ); } @@ -431,7 +429,6 @@ class WP_Users_List_Table extends WP_List_Table { } else { $edit = '' . $user_object->user_login . ''; } - $role_name = isset( $wp_roles->role_names[$role] ) ? translate_user_role( $wp_roles->role_names[$role] ) : __( 'None' ); $avatar = get_avatar( $user_object->ID, 32 ); // Comma-separated list of user roles. @@ -527,6 +524,8 @@ 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. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 139a4206a9..25db95affa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35010'; +$wp_version = '4.4-alpha-35011'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.