--- a/wp/wp-admin/includes/class-wp-ms-users-list-table.php Thu Sep 29 08:06:27 2022 +0200
+++ b/wp/wp-admin/includes/class-wp-ms-users-list-table.php Fri Sep 05 18:40:08 2025 +0200
@@ -11,7 +11,6 @@
* Core class used to implement displaying users in a list table for the network admin.
*
* @since 3.1.0
- * @access private
*
* @see WP_List_Table
*/
@@ -137,13 +136,10 @@
$super_admins = get_super_admins();
$total_admins = count( $super_admins );
- $current_link_attributes = 'super' !== $role ? ' class="current" aria-current="page"' : '';
- $role_links = array();
- $role_links['all'] = sprintf(
- '<a href="%s"%s>%s</a>',
- network_admin_url( 'users.php' ),
- $current_link_attributes,
- sprintf(
+ $role_links = array();
+ $role_links['all'] = array(
+ 'url' => network_admin_url( 'users.php' ),
+ 'label' => sprintf(
/* translators: Number of users. */
_nx(
'All <span class="count">(%s)</span>',
@@ -152,14 +148,13 @@
'users'
),
number_format_i18n( $total_users )
- )
+ ),
+ 'current' => 'super' !== $role,
);
- $current_link_attributes = 'super' === $role ? ' class="current" aria-current="page"' : '';
- $role_links['super'] = sprintf(
- '<a href="%s"%s>%s</a>',
- network_admin_url( 'users.php?role=super' ),
- $current_link_attributes,
- sprintf(
+
+ $role_links['super'] = array(
+ 'url' => network_admin_url( 'users.php?role=super' ),
+ 'label' => sprintf(
/* translators: Number of users. */
_n(
'Super Admin <span class="count">(%s)</span>',
@@ -167,10 +162,11 @@
$total_admins
),
number_format_i18n( $total_admins )
- )
+ ),
+ 'current' => 'super' === $role,
);
- return $role_links;
+ return $this->get_views_links( $role_links );
}
/**
@@ -189,7 +185,7 @@
}
/**
- * @return array
+ * @return string[] Array of column titles keyed by their column name.
*/
public function get_columns() {
$users_columns = array(
@@ -216,10 +212,10 @@
*/
protected function get_sortable_columns() {
return array(
- 'username' => 'login',
- 'name' => 'name',
- 'email' => 'email',
- 'registered' => 'id',
+ 'username' => array( 'login', false, __( 'Username' ), __( 'Table ordered by Username.' ), 'asc' ),
+ 'name' => array( 'name', false, __( 'Name' ), __( 'Table ordered by Name.' ) ),
+ 'email' => array( 'email', false, __( 'E-mail' ), __( 'Table ordered by E-mail.' ) ),
+ 'registered' => array( 'id', false, _x( 'Registered', 'user' ), __( 'Table ordered by User Registered Date.' ) ),
);
}
@@ -239,13 +235,15 @@
return;
}
?>
- <label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>">
+ <input type="checkbox" id="blog_<?php echo $user->ID; ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ); ?>" />
+ <label for="blog_<?php echo $user->ID; ?>">
+ <span class="screen-reader-text">
<?php
- /* translators: %s: User login. */
+ /* translators: Hidden accessibility text. %s: User login. */
printf( __( 'Select %s' ), $user->user_login );
?>
+ </span>
</label>
- <input type="checkbox" id="blog_<?php echo $user->ID; ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ); ?>" />
<?php
}
@@ -302,13 +300,21 @@
*/
public function column_name( $user ) {
if ( $user->first_name && $user->last_name ) {
- echo "$user->first_name $user->last_name";
+ printf(
+ /* translators: 1: User's first name, 2: Last name. */
+ _x( '%1$s %2$s', 'Display name based on first name and last name' ),
+ $user->first_name,
+ $user->last_name
+ );
} elseif ( $user->first_name ) {
echo $user->first_name;
} elseif ( $user->last_name ) {
echo $user->last_name;
} else {
- echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
+ echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' .
+ /* translators: Hidden accessibility text. */
+ _x( 'Unknown', 'name' ) .
+ '</span>';
}
}
@@ -377,25 +383,30 @@
$path = ( '/' === $site->path ) ? '' : $site->path;
$site_classes = array( 'site-' . $site->site_id );
+
/**
- * Filters the span class for a site listing on the mulisite user list table.
+ * Filters the span class for a site listing on the multisite user list table.
*
* @since 5.2.0
*
- * @param string[] $site_classes Array of class names used within the span tag. Default "site-#" with the site's network ID.
+ * @param string[] $site_classes Array of class names used within the span tag.
+ * Default "site-#" with the site's network ID.
* @param int $site_id Site ID.
* @param int $network_id Network ID.
* @param WP_User $user WP_User object.
*/
$site_classes = apply_filters( 'ms_user_list_site_class', $site_classes, $site->userblog_id, $site->site_id, $user );
+
if ( is_array( $site_classes ) && ! empty( $site_classes ) ) {
$site_classes = array_map( 'sanitize_html_class', array_unique( $site_classes ) );
echo '<span class="' . esc_attr( implode( ' ', $site_classes ) ) . '">';
} else {
echo '<span>';
}
+
echo '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $site->userblog_id ) ) . '">' . str_replace( '.' . get_network()->domain, '', $site->domain . $path ) . '</a>';
echo ' <small class="row-actions">';
+
$actions = array();
$actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $site->userblog_id ) ) . '">' . __( 'Edit' ) . '</a>';
@@ -433,12 +444,12 @@
foreach ( $actions as $action => $link ) {
++$i;
- $sep = ( $i < $action_count ) ? ' | ' : '';
+ $separator = ( $i < $action_count ) ? ' | ' : '';
- echo "<span class='$action'>$link$sep</span>";
+ echo "<span class='$action'>{$link}{$separator}</span>";
}
- echo '</small></span><br/>';
+ echo '</small></span><br />';
}
}
@@ -452,13 +463,11 @@
* @param string $column_name The current column name.
*/
public function column_default( $item, $column_name ) {
+ // Restores the more descriptive, specific name for use within this method.
+ $user = $item;
+
/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
- echo apply_filters(
- 'manage_users_custom_column',
- '', // Custom column output. Default empty.
- $column_name,
- $item->ID // User ID.
- );
+ echo apply_filters( 'manage_users_custom_column', '', $column_name, $user->ID );
}
public function display_rows() {
@@ -513,10 +522,10 @@
}
// Restores the more descriptive, specific name for use within this method.
- $user = $item;
+ $user = $item;
+
$super_admins = get_super_admins();
-
- $actions = array();
+ $actions = array();
if ( current_user_can( 'edit_user', $user->ID ) ) {
$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );