Ticket #46122: 46122.2.diff

src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -133 +133 @@
         protected function get_views() {
                 global $role;
 
+                $role_links   = array();
+
                 $total_users  = get_user_count();
+
+                $current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
+                $status_label            = sprintf(
+                        /* translators: %s: all users count */
+                        _nx(
+                                'All <span class="count">(%s)</span>',
+                                'All <span class="count">(%s)</span>',
+                                $total_users,
+                                'user roles'
+                        ),
+                        number_format_i18n( $total_users )
+                );
+
+                $role_links['all'] = sprintf(
+                        '<a href="%s"%s>%s</a>',
+                        esc_url( network_admin_url( 'users.php' ) ),
+                        $current_link_attributes,
+                        $status_label
+                );
+
                 $super_admins = get_super_admins();
                 $total_admins = count( $super_admins );
 
-                $current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
-                $role_links              = array();
-                $role_links['all']       = "<a href='" . network_admin_url( 'users.php' ) . "'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
                 $current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : '';
-                $role_links['super']     = "<a href='" . network_admin_url( 'users.php?role=super' ) . "'$current_link_attributes>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
+                $status_label            = sprintf(
+                        /* translators: %s: all users count */
+                        _nx(
+                                'Super Admin <span class="count">(%s)</span>',
+                                'Super Admins <span class="count">(%s)</span>',
+                                $total_admins,
+                                'user roles'
+                        ),
+                        number_format_i18n( $total_admins )
+                );
 
+                $role_links['super'] = sprintf(
+                        '<a href="%s"%s>%s</a>',
+                        esc_url( network_admin_url( 'users.php?role=super' ) ),
+                        $current_link_attributes,
+                        $status_label
+                );
+
                 return $role_links;
         }
 

src/wp-admin/includes/class-wp-users-list-table.php

@@ -175 +175 @@
         protected function get_views() {
                 global $role;
 
-                $wp_roles = wp_roles();
+                $wp_roles       = wp_roles();
+                $role_links = array();
 
                 if ( $this->is_site_users ) {
                         $url = 'site-users.php?id=' . $this->site_id;
@@ -192 +193 @@
                 unset( $users_of_blog );
 
                 $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
+                $status_label            = sprintf(
+                        /* translators: %s: all users count */
+                        _nx(
+                                'All <span class="count">(%s)</span>',
+                                'All <span class="count">(%s)</span>',
+                                $total_users,
+                                'user roles'
+                        ),
+                        number_format_i18n( $total_users )
+                );
 
-                $role_links        = array();
-                $role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
-                foreach ( $wp_roles->get_names() as $this_role => $name ) {
+                $role_links['all'] = sprintf(
+                        '<a href="%s"%s>%s</a>',
+                        esc_url( $url ),
+                        $current_link_attributes,
+                        $status_label
+                );
+                
+                foreach ( $wp_roles->get_names() as $this_role => $role_name ) {
                         if ( ! isset( $avail_roles[ $this_role ] ) ) {
                                 continue;
                         }
 
-                        $current_link_attributes = '';
+                        $current_link_attributes = $this_role === $role ? ' class="current" aria-current="page"' : '';
+                        $role_name               = sprintf( 
+                                /* translators: User role name with count */
+                                __( '%1$s <span class="count">(%2$s)</span>' ), 
+                                translate_user_role( $role_name ), 
+                                number_format_i18n( $avail_roles[ $this_role ] ) 
+                        );
 
-                        if ( $this_role === $role ) {
-                                $current_link_attributes = ' class="current" aria-current="page"';
-                        }
-
-                        $name = translate_user_role( $name );
-                        /* translators: User role name with count */
-                        $name                     = sprintf( __( '%1$s <span class="count">(%2$s)</span>' ), $name, number_format_i18n( $avail_roles[ $this_role ] ) );
-                        $role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
+                        $role_links[ $this_role ] = sprintf(
+                                '<a href="%s"%s>%s</a>',
+                                esc_url( add_query_arg( 'role', $this_role, $url ) ),
+                                $current_link_attributes,
+                                $role_name                              
+                        );
                 }
 
                 if ( ! empty( $avail_roles['none'] ) ) {
 
-                        $current_link_attributes = '';
+                        $current_link_attributes = 'none' === $role ? ' class="current" aria-current="page"' : '';
+                        $role_name               = sprintf( 
+                                /* translators: User role name with count */
+                                __( '%1$s <span class="count">(%2$s)</span>' ), 
+                                /* translators: No role available */
+                                __( 'No role' ), 
+                                number_format_i18n( $avail_roles['none'] ) 
+                        );
 
-                        if ( 'none' === $role ) {
-                                $current_link_attributes = ' class="current" aria-current="page"';
-                        }
+                        $role_links[ 'none' ] = sprintf(
+                                '<a href="%s"%s>%s</a>',
+                                esc_url( add_query_arg( 'role', 'none', $url ) ),
+                                $current_link_attributes,
+                                $role_name                              
+                        );                      
 
-                        $name = __( 'No role' );
-                        /* translators: User role name with count */
-                        $name               = sprintf( __( '%1$s <span class="count">(%2$s)</span>' ), $name, number_format_i18n( $avail_roles['none'] ) );
-                        $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
-
                 }
 
                 return $role_links;