Site logo / title accessibility

src/wp-content/themes/twentytwenty/inc/template-tags.php

@@ -38,13 +38,14 @@
 	$classname  = '';
 
 	$defaults = array(
-		'logo'        => '%1$s<span class="screen-reader-text">%2$s</span>',
-		'logo_class'  => 'site-logo',
-		'title'       => '<a href="%1$s">%2$s</a>',
-		'title_class' => 'site-title',
-		'home_wrap'   => '<h1 class="%1$s">%2$s</h1>',
-		'single_wrap' => '<div class="%1$s faux-heading">%2$s</div>',
-		'condition'   => ( is_front_page() || is_home() ) && ! is_page(),
+		'logo'         => '%1$s<span class="screen-reader-text">%2$s</span>',
+		'logo_class'   => 'site-logo',
+		'home_title'   => '<a href="%1$s" aria-current="page" rel="home">%2$s</a>',
+		'single_title' => '<a href="%1$s" rel="home">%2$s</a>',
+		'title_class'  => 'site-title',
+		'home_wrap'    => '<h1 class="%1$s">%2$s</h1>',
+		'single_wrap'  => '<div class="%1$s faux-heading">%2$s</div>',
+		'condition'    => ( is_front_page() || is_home() ) && ! is_page(),
 	);
 
 	$args = wp_parse_args( $args, $defaults );
@@ -59,11 +60,13 @@
 	 */
 	$args = apply_filters( 'twentytwenty_site_logo_args', $args, $defaults );
 
+	$titlewrap = $args['condition'] ? 'home_title' : 'single_title';
+
 	if ( has_custom_logo() ) {
 		$contents  = sprintf( $args['logo'], $logo, esc_html( $site_title ) );
 		$classname = $args['logo_class'];
 	} else {
-		$contents  = sprintf( $args['title'], esc_url( get_home_url( null, '/' ) ), esc_html( $site_title ) );
+		$contents  = sprintf( $args[$titlewrap], esc_url( get_home_url( null, '/' ) ), esc_html( $site_title ) );
 		$classname = $args['title_class'];
 	}