diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 19921ae5bc..35310805eb 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -365,7 +365,7 @@ class WP_Users_List_Table extends WP_List_Table { * @return string[] Array of column titles keyed by their column name. */ public function get_columns() { - $c = array( + $columns = array( 'cb' => '', 'username' => __( 'Username' ), 'name' => __( 'Name' ), @@ -375,10 +375,10 @@ class WP_Users_List_Table extends WP_List_Table { ); if ( $this->is_site_users ) { - unset( $c['posts'] ); + unset( $columns['posts'] ); } - return $c; + return $columns; } /** @@ -389,12 +389,12 @@ class WP_Users_List_Table extends WP_List_Table { * @return array Array of sortable columns. */ protected function get_sortable_columns() { - $c = array( + $columns = array( 'username' => 'login', 'email' => 'email', ); - return $c; + return $columns; } /** @@ -537,7 +537,7 @@ class WP_Users_List_Table extends WP_List_Table { // Comma-separated list of user roles. $roles_list = implode( ', ', $user_roles ); - $r = ""; + $row = ""; list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); @@ -559,41 +559,41 @@ class WP_Users_List_Table extends WP_List_Table { $attributes = "class='$classes' $data"; if ( 'cb' === $column_name ) { - $r .= "$checkbox"; + $row .= "$checkbox"; } else { - $r .= ""; + $row .= ""; switch ( $column_name ) { case 'username': - $r .= "$avatar $edit"; + $row .= "$avatar $edit"; break; case 'name': if ( $user_object->first_name && $user_object->last_name ) { - $r .= sprintf( + $row .= sprintf( /* translators: 1: User's first name, 2: Last name. */ _x( '%1$s %2$s', 'Display name based on first name and last name' ), $user_object->first_name, $user_object->last_name ); } elseif ( $user_object->first_name ) { - $r .= $user_object->first_name; + $row .= $user_object->first_name; } elseif ( $user_object->last_name ) { - $r .= $user_object->last_name; + $row .= $user_object->last_name; } else { - $r .= sprintf( + $row .= sprintf( '%s', _x( 'Unknown', 'name' ) ); } break; case 'email': - $r .= "$email"; + $row .= "$email"; break; case 'role': - $r .= esc_html( $roles_list ); + $row .= esc_html( $roles_list ); break; case 'posts': if ( $numposts > 0 ) { - $r .= sprintf( + $row .= sprintf( '%s', "edit.php?author={$user_object->ID}", $numposts, @@ -604,7 +604,7 @@ class WP_Users_List_Table extends WP_List_Table { ) ); } else { - $r .= 0; + $row .= 0; } break; default: @@ -617,18 +617,18 @@ class WP_Users_List_Table extends WP_List_Table { * @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 ); + $row .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID ); } if ( $primary === $column_name ) { - $r .= $this->row_actions( $actions ); + $row .= $this->row_actions( $actions ); } - $r .= ''; + $row .= ''; } } - $r .= ''; + $row .= ''; - return $r; + return $row; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index a979c16fe0..046c19f0a7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-54069'; +$wp_version = '6.1-alpha-54070'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.