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

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
This commit is contained in:
Scott Taylor 2015-10-10 15:26:24 +00:00
parent d021cb8bc0
commit ab2905da84
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = '<strong>' . $user_object->user_login . '</strong>';
}
$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.
*/

2
wp-includes/version.php
View File

@ -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.