Index: src/wp-admin/includes/class-wp-comments-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-comments-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-comments-list-table.php (working copy) @@ -246,8 +246,12 @@ $link = add_query_arg( 'comment_type', $comment_type, $link ); foreach ( $stati as $status => $label ) { - $class = ( $status === $comment_status ) ? ' class="current"' : ''; + $current_link_attributes = ''; + if ( $status === $comment_status ) { + $current_link_attributes = ' class="current" aria-current="page"'; + } + if ( !isset( $num_comments->$status ) ) $num_comments->$status = 10; $link = add_query_arg( 'comment_status', $status, $link ); @@ -258,7 +262,7 @@ if ( !empty( $_REQUEST['s'] ) ) $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link ); */ - $status_links[ $status ] = "" . sprintf( + $status_links[ $status ] = "" . sprintf( translate_nooped_plural( $label, $num_comments->$status ), sprintf( '%s', ( 'moderated' === $status ) ? 'pending' : $status, Index: src/wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-themes-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-ms-themes-list-table.php (working copy) @@ -306,9 +306,9 @@ $url = 'themes.php'; if ( 'search' != $type ) { - $status_links[$type] = sprintf( "%s", + $status_links[$type] = sprintf( "%s", esc_url( add_query_arg('theme_status', $type, $url) ), - ( $type === $status ) ? ' class="current"' : '', + ( $type === $status ) ? ' class="current" aria-current="page"' : '', sprintf( $text, number_format_i18n( $count ) ) ); } Index: src/wp-admin/includes/class-wp-ms-users-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-ms-users-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-ms-users-list-table.php (working copy) @@ -134,11 +134,11 @@ $super_admins = get_super_admins(); $total_admins = count( $super_admins ); - $class = $role != 'super' ? ' class="current"' : ''; + $current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : ''; $role_links = array(); - $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; - $class = $role === 'super' ? ' class="current"' : ''; - $role_links['super'] = "" . sprintf( _n( 'Super Admin (%s)', 'Super Admins (%s)', $total_admins ), number_format_i18n( $total_admins ) ) . ''; + $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; + $current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : ''; + $role_links['super'] = "" . sprintf( _n( 'Super Admin (%s)', 'Super Admins (%s)', $total_admins ), number_format_i18n( $total_admins ) ) . ''; return $role_links; } Index: src/wp-admin/includes/class-wp-plugin-install-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-plugin-install-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-plugin-install-list-table.php (working copy) @@ -286,9 +286,9 @@ $display_tabs = array(); foreach ( (array) $tabs as $action => $text ) { - $class = ( $action === $tab ) ? ' current' : ''; + $current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : ''; $href = self_admin_url('plugin-install.php?tab=' . $action); - $display_tabs['plugin-install-'.$action] = "$text"; + $display_tabs['plugin-install-'.$action] = "$text"; } // No longer a real tab. unset( $display_tabs['plugin-install-upload'] ); Index: src/wp-admin/includes/class-wp-plugins-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-plugins-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-plugins-list-table.php (working copy) @@ -432,9 +432,9 @@ } if ( 'search' !== $type ) { - $status_links[$type] = sprintf( "%s", + $status_links[$type] = sprintf( "%s", add_query_arg('plugin_status', $type, 'plugins.php'), - ( $type === $status ) ? ' class="current"' : '', + ( $type === $status ) ? ' class="current" aria-current="page"' : '', sprintf( $text, number_format_i18n( $count ) ) ); } Index: src/wp-admin/includes/class-wp-posts-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-posts-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-posts-list-table.php (working copy) @@ -231,18 +231,23 @@ protected function get_edit_link( $args, $label, $class = '' ) { $url = add_query_arg( $args, 'edit.php' ); - $class_html = ''; + $class_html = $aria_current = ''; if ( ! empty( $class ) ) { $class_html = sprintf( ' class="%s"', esc_attr( $class ) ); + + if ( 'current' === $class ) { + $aria_current = ' aria-current="page"'; + } } return sprintf( - '%s', + '%s', esc_url( $url ), $class_html, + $aria_current, $label ); } Index: src/wp-admin/includes/class-wp-theme-install-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-theme-install-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-theme-install-list-table.php (working copy) @@ -170,9 +170,9 @@ $display_tabs = array(); foreach ( (array) $tabs as $action => $text ) { - $class = ( $action === $tab ) ? ' class="current"' : ''; + $current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : ''; $href = self_admin_url('theme-install.php?tab=' . $action); - $display_tabs['theme-install-'.$action] = "$text"; + $display_tabs['theme-install-'.$action] = "$text"; } return $display_tabs; Index: src/wp-admin/includes/class-wp-users-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-users-list-table.php (revision 41658) +++ src/wp-admin/includes/class-wp-users-list-table.php (working copy) @@ -196,13 +196,14 @@ $avail_roles = array(); } - $class = empty($role) ? ' class="current"' : ''; + $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : ''; + $role_links = array(); if ( $count_users ) { - $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; + $role_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_users, 'users' ), number_format_i18n( $total_users ) ) . ''; } else { - $role_links['all'] = "" . _x( 'All', 'users' ) . ''; + $role_links['all'] = "" . _x( 'All', 'users' ) . ''; } foreach ( $wp_roles->get_names() as $this_role => $name ) { if ( $count_users && !isset($avail_roles[$this_role]) ) { @@ -209,10 +210,10 @@ continue; } - $class = ''; + $current_link_attributes = ''; if ( $this_role === $role ) { - $class = ' class="current"'; + $current_link_attributes = ' class="current" aria-current="page"'; } $name = translate_user_role( $name ); @@ -220,15 +221,15 @@ /* translators: User role name with count */ $name = sprintf( __('%1$s (%2$s)'), $name, number_format_i18n( $avail_roles[$this_role] ) ); } - $role_links[$this_role] = "$name"; + $role_links[$this_role] = "$name"; } if ( ! $count_users || ! empty( $avail_roles['none' ] ) ) { - $class = ''; + $current_link_attributes = ''; if ( 'none' === $role ) { - $class = ' class="current"'; + $current_link_attributes = ' class="current" aria-current="page"'; } $name = __( 'No role' ); @@ -236,7 +237,7 @@ /* translators: User role name with count */ $name = sprintf( __('%1$s (%2$s)'), $name, number_format_i18n( $avail_roles['none' ] ) ); } - $role_links['none'] = "$name"; + $role_links['none'] = "$name"; } Index: src/wp-admin/js/theme.js =================================================================== --- src/wp-admin/js/theme.js (revision 41658) +++ src/wp-admin/js/theme.js (working copy) @@ -1539,7 +1539,10 @@ request.tag = [ value.slice( 4 ) ]; } - $( '.filter-links li > a.current' ).removeClass( 'current' ); + $( '.filter-links li > a.current' ) + .removeClass( 'current' ) + .removeAttr( 'aria-current' ); + $( 'body' ).removeClass( 'show-filters filters-applied show-favorites-form' ); $( '.drawer-toggle' ).attr( 'aria-expanded', 'false' ); @@ -1663,9 +1666,14 @@ // Track sorting so we can restore the correct tab when closing preview. themes.router.selectedTab = sort; - $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass ); - $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass ); + $( '.filter-links li > a, .theme-filter' ) + .removeClass( this.activeClass ) + .removeAttr( 'aria-current' ); + $( '[data-sort="' + sort + '"]' ) + .addClass( this.activeClass ) + .attr( 'aria-current', 'page' ); + if ( 'favorites' === sort ) { $( 'body' ).addClass( 'show-favorites-form' ); } else { @@ -1686,8 +1694,12 @@ return; } - $( '.filter-links li > a, .theme-section' ).removeClass( this.activeClass ); - $el.addClass( this.activeClass ); + $( '.filter-links li > a, .theme-section' ) + .removeClass( this.activeClass ) + .removeAttr( 'aria-current' ); + $el + .addClass( this.activeClass ) + .attr( 'aria-current', 'page' ); if ( ! filter ) { return; @@ -1725,7 +1737,10 @@ } $( 'body' ).addClass( 'filters-applied' ); - $( '.filter-links li > a.current' ).removeClass( 'current' ); + $( '.filter-links li > a.current' ) + .removeClass( 'current' ) + .removeAttr( 'aria-current' ); + filteringBy.empty(); _.each( tags, function( tag ) {