X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..refs/tags/wordpress-4.3:/wp-admin/includes/class-wp-users-list-table.php diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 50067363..4035c58c 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -56,6 +56,8 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @return bool */ public function ajax_user_can() { if ( $this->is_site_users ) @@ -69,6 +71,9 @@ class WP_Users_List_Table extends WP_List_Table { * * @since 3.1.0 * @access public + * + * @global string $role + * @global string $usersearch */ public function prepare_items() { global $role, $usersearch; @@ -133,10 +138,14 @@ class WP_Users_List_Table extends WP_List_Table { * @since 3.1.0 * @access protected * + * @global string $role + * * @return array An array of HTML links, one for each view. */ protected function get_views() { - global $wp_roles, $role; + global $role; + + $wp_roles = wp_roles(); if ( $this->is_site_users ) { $url = 'site-users.php?id=' . $this->site_id; @@ -329,8 +338,6 @@ class WP_Users_List_Table extends WP_List_Table { * @since 4.2.0 The `$style` argument was deprecated. * @access public * - * @global WP_Roles $wp_roles User roles object. - * * @param object $user_object The current user object. * @param string $style Deprecated. Not used. * @param string $role Optional. Key for the $wp_roles array. Default empty. @@ -339,7 +346,7 @@ 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 ) { - global $wp_roles; + $wp_roles = wp_roles(); if ( ! ( $user_object instanceof WP_User ) ) { $user_object = get_userdata( (int) $user_object ); @@ -384,7 +391,6 @@ class WP_Users_List_Table extends WP_List_Table { * @param WP_User $user_object WP_User object for the currently-listed user. */ $actions = apply_filters( 'user_row_actions', $actions, $user_object ); - $edit .= $this->row_actions( $actions ); // Set up the checkbox ( because the user is editable, otherwise it's empty ) $checkbox = '' @@ -398,63 +404,85 @@ class WP_Users_List_Table extends WP_List_Table { $r = ""; - list( $columns, $hidden ) = $this->get_column_info(); + list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); foreach ( $columns as $column_name => $column_display_name ) { - $class = "class=\"$column_name column-$column_name\""; - - $style = ''; - if ( in_array( $column_name, $hidden ) ) - $style = ' style="display:none;"'; - - $attributes = "$class$style"; - - switch ( $column_name ) { - case 'cb': - $r .= "$checkbox"; - break; - case 'username': - $r .= "$avatar $edit"; - break; - case 'name': - $r .= "$user_object->first_name $user_object->last_name"; - break; - case 'email': - $r .= "$email"; - break; - case 'role': - $r .= "$role_name"; - break; - case 'posts': - $attributes = 'class="posts column-posts num"' . $style; - $r .= ""; - if ( $numposts > 0 ) { - $r .= ""; - $r .= $numposts; - $r .= ''; - } else { - $r .= 0; - } - $r .= ""; - break; - default: - $r .= ""; - - /** - * Filter the display output of custom columns in the Users list table. - * - * @since 2.8.0 - * - * @param string $output Custom column output. Default empty. - * @param string $column_name Column name. - * @param int $user_id ID of the currently-listed user. - */ - $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); - $r .= ""; + $classes = "$column_name column-$column_name"; + if ( $primary === $column_name ) { + $classes .= ' has-row-actions column-primary'; + } + if ( 'posts' === $column_name ) { + $classes .= ' num'; // Special case for that column + } + + if ( in_array( $column_name, $hidden ) ) { + $classes .= ' hidden'; + } + + $data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"'; + + $attributes = "class='$classes' $data"; + + if ( 'cb' === $column_name ) { + $r .= "$checkbox"; + } else { + $r .= ""; + switch ( $column_name ) { + case 'username': + $r .= "$avatar $edit"; + break; + case 'name': + $r .= "$user_object->first_name $user_object->last_name"; + break; + case 'email': + $r .= "$email"; + break; + case 'role': + $r .= $role_name; + break; + case 'posts': + if ( $numposts > 0 ) { + $r .= ""; + $r .= ''; + $r .= '' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . ''; + $r .= ''; + } else { + $r .= 0; + } + break; + default: + /** + * Filter the display output of custom columns in the Users list table. + * + * @since 2.8.0 + * + * @param string $output Custom column output. Default empty. + * @param string $column_name Column name. + * @param int $user_id ID of the currently-listed user. + */ + $r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); + } + + if ( $primary === $column_name ) { + $r .= $this->row_actions( $actions ); + } + $r .= ""; } } $r .= ''; return $r; } + + /** + * Gets the name of the default primary column. + * + * @since 4.3.0 + * @access protected + * + * @return string Name of the default primary column, in this case, 'username'. + */ + protected function get_default_primary_column_name() { + return 'username'; + } }