From d00545bd4012d6b8991e82864cb472bb37e95953 Mon Sep 17 00:00:00 2001
From: joedolson <joedolson@git.wordpress.org>
Date: Fri, 18 Jul 2025 03:31:28 +0000
Subject: [PATCH] Bundled Theme: Prevent output of empty title tags.

In Twenty Ten, Twenty Eleven, Twenty Twelve, Twenty Thirteen, Twenty Fourteen, Twenty Fifteen, Twenty Sixteen, Twenty Seventeen, and Twenty Twenty, an empty site title would result in an empty heading and/or an empty link in the site header. These can pollute the heading hierarchy and add a un-named link in screen reader navigation.

Prevent the output of wrapping tags if site title or site description have no value.

Props tsquez, audrasjb, sabernhardt, rehanali, sukhendu2002, dilipbheda, sirlouen, joedolson.
Fixes #44656.
Built from https://develop.svn.wordpress.org/trunk@60483


git-svn-id: http://core.svn.wordpress.org/trunk@59819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/header.php     | 22 ++++++++++---
 wp-content/themes/twentyfifteen/header.php    | 31 +++++++++---------
 wp-content/themes/twentyfourteen/header.php   |  7 +++-
 .../template-parts/header/site-branding.php   | 18 +++++++----
 wp-content/themes/twentysixteen/header.php    | 16 ++++++----
 wp-content/themes/twentyten/header.php        | 32 +++++++++++++------
 wp-content/themes/twentythirteen/header.php   | 15 +++++++--
 wp-content/themes/twentytwelve/header.php     | 18 +++++++++--
 .../themes/twentytwenty/inc/template-tags.php |  4 +++
 wp-includes/version.php                       |  2 +-
 10 files changed, 114 insertions(+), 51 deletions(-)

diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index 3859daae39..fe76023939 100644
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -78,14 +78,26 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 <div id="page" class="hfeed">
 	<header id="branding">
 			<hgroup>
-			<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
-				<h1 id="site-title"><span><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></span></h1>
-				<h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
+				<?php
+				$is_front         = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+				$site_name        = get_bloginfo( 'name', 'display' );
+				$site_description = get_bloginfo( 'description', 'display' );
+
+				if ( $site_name ) :
+					?>
+					<h1 id="site-title"><span><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></span></h1>
+					<?php
+				endif;
+
+				if ( $site_description ) :
+					?>
+					<h2 id="site-description"><?php echo $site_description; ?></h2>
+				<?php endif; ?>
 			</hgroup>
 
 			<?php
-				// Check to see if the header image has been removed.
-				$header_image = get_header_image();
+			// Check to see if the header image has been removed.
+			$header_image = get_header_image();
 			if ( $header_image ) :
 				// Compatibility with versions of WordPress prior to 3.4.
 				if ( function_exists( 'get_custom_header' ) ) {
diff --git a/wp-content/themes/twentyfifteen/header.php b/wp-content/themes/twentyfifteen/header.php
index 48357830a7..23f266c1e1 100644
--- a/wp-content/themes/twentyfifteen/header.php
+++ b/wp-content/themes/twentyfifteen/header.php
@@ -32,23 +32,24 @@
 		<header id="masthead" class="site-header">
 			<div class="site-branding">
 				<?php
-					twentyfifteen_the_custom_logo();
-					$is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
-				if ( is_front_page() && is_home() ) :
-					?>
-						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></h1>
-					<?php else : ?>
-						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></p>
-						<?php
-					endif;
+				twentyfifteen_the_custom_logo();
+				$is_front  = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+				$site_name = get_bloginfo( 'name', 'display' );
 
-					$description = get_bloginfo( 'description', 'display' );
-					if ( $description || is_customize_preview() ) :
-						?>
-						<p class="site-description"><?php echo $description; ?></p>
-						<?php
-					endif;
+				if ( $site_name && is_front_page() && is_home() ) :
 					?>
+					<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></h1>
+				<?php elseif ( $site_name ) : ?>
+					<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></p>
+					<?php
+				endif;
+
+				$description = get_bloginfo( 'description', 'display' );
+				if ( $description || is_customize_preview() ) :
+					?>
+					<p class="site-description"><?php echo $description; ?></p>
+				<?php endif; ?>
+
 				<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
 		</header><!-- .site-header -->
diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index 945824853a..c62b86a411 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -50,7 +50,12 @@
 
 	<header id="masthead" class="site-header">
 		<div class="header-main">
-			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></h1>
+			<?php
+			$site_name = get_bloginfo( 'name', 'display' );
+			if ( $site_name ) :
+				?>
+				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></h1>
+			<?php endif; ?>
 
 			<div class="search-toggle">
 				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container">
diff --git a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
index 18cd66caf8..57fd1ec9b8 100644
--- a/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
+++ b/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
@@ -15,14 +15,18 @@
 		<?php the_custom_logo(); ?>
 
 		<div class="site-branding-text">
-			<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
-			<?php if ( is_front_page() ) : ?>
-				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></h1>
-			<?php else : ?>
-				<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></p>
-			<?php endif; ?>
-
 			<?php
+			$is_front  = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+			$site_name = get_bloginfo( 'name', 'display' );
+
+			if ( $site_name && is_front_page() ) :
+				?>
+				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></h1>
+			<?php elseif ( $site_name ) : ?>
+				<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></p>
+				<?php
+			endif;
+
 			$description = get_bloginfo( 'description', 'display' );
 
 			if ( $description || is_customize_preview() ) :
diff --git a/wp-content/themes/twentysixteen/header.php b/wp-content/themes/twentysixteen/header.php
index 09a230e222..28deb29619 100644
--- a/wp-content/themes/twentysixteen/header.php
+++ b/wp-content/themes/twentysixteen/header.php
@@ -35,12 +35,16 @@
 		<header id="masthead" class="site-header">
 			<div class="site-header-main">
 				<div class="site-branding">
-					<?php twentysixteen_the_custom_logo(); ?>
-					<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
-					<?php if ( is_front_page() && is_home() ) : ?>
-						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></h1>
-					<?php else : ?>
-						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></p>
+					<?php
+					twentysixteen_the_custom_logo();
+					$is_front  = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+					$site_name = get_bloginfo( 'name', 'display' );
+
+					if ( $site_name && is_front_page() && is_home() ) :
+						?>
+						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></h1>
+					<?php elseif ( $site_name ) : ?>
+						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></p>
 						<?php
 					endif;
 
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 6a892efe74..6f51ecf0b8 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -68,17 +68,29 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 	<div id="header">
 		<div id="masthead">
 			<div id="branding" role="banner">
-				<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
-				<<?php echo $heading_tag; ?> id="site-title">
-					<span>
-					<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
-						<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a>
-					</span>
-				</<?php echo $heading_tag; ?>>
-				<div id="site-description"><?php bloginfo( 'description' ); ?></div>
-
 				<?php
-					// Compatibility with versions of WordPress prior to 3.4.
+				$heading_tag      = ( is_home() || is_front_page() ) ? 'h1' : 'div';
+				$is_front         = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+				$site_name        = get_bloginfo( 'name', 'display' );
+				$site_description = get_bloginfo( 'description', 'display' );
+
+				if ( $site_name ) :
+					?>
+					<<?php echo $heading_tag; ?> id="site-title">
+						<span>
+							<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a>
+						</span>
+					</<?php echo $heading_tag; ?>>
+					<?php
+				endif;
+
+				if ( $site_description ) :
+					?>
+					<div id="site-description"><?php echo $site_description; ?></div>
+					<?php
+				endif;
+
+				// Compatibility with versions of WordPress prior to 3.4.
 				if ( function_exists( 'get_custom_header' ) ) {
 					/*
 					 * We need to figure out what the minimum width should be for our featured image.
diff --git a/wp-content/themes/twentythirteen/header.php b/wp-content/themes/twentythirteen/header.php
index ef0fcb1e05..4dad88c300 100644
--- a/wp-content/themes/twentythirteen/header.php
+++ b/wp-content/themes/twentythirteen/header.php
@@ -29,10 +29,19 @@
 			?>
 		</a>
 		<header id="masthead" class="site-header">
-		<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
+			<?php
+			$is_front         = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+			$site_name        = get_bloginfo( 'name', 'display' );
+			$site_description = get_bloginfo( 'description', 'display' );
+
+			?>
 			<a class="home-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>>
-				<h1 class="site-title"><?php bloginfo( 'name' ); ?></h1>
-				<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
+				<?php if ( $site_name ) : ?>
+					<h1 class="site-title"><?php echo $site_name; ?></h1>
+				<?php endif; ?>
+				<?php if ( $site_description ) : ?>
+					<h2 class="site-description"><?php echo $site_description; ?></h2>
+				<?php endif; ?>
 			</a>
 
 			<div id="navbar" class="navbar">
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 9bbac652c9..c1eb18ae0a 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -37,9 +37,21 @@
 	<a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
 	<header id="masthead" class="site-header">
 		<hgroup>
-		<?php $is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ); ?>
-			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php bloginfo( 'name' ); ?></a></h1>
-			<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
+			<?php
+			$is_front         = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
+			$site_name        = get_bloginfo( 'name', 'display' );
+			$site_description = get_bloginfo( 'description', 'display' );
+
+			if ( $site_name ) :
+				?>
+				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home" <?php echo $is_front ? 'aria-current="page"' : ''; ?>><?php echo $site_name; ?></a></h1>
+				<?php
+			endif;
+
+			if ( $site_description ) :
+				?>
+				<h2 class="site-description"><?php echo $site_description; ?></h2>
+			<?php endif; ?>
 		</hgroup>
 
 		<nav id="site-navigation" class="main-navigation">
diff --git a/wp-content/themes/twentytwenty/inc/template-tags.php b/wp-content/themes/twentytwenty/inc/template-tags.php
index 3b89da5f95..f2b63a4543 100644
--- a/wp-content/themes/twentytwenty/inc/template-tags.php
+++ b/wp-content/themes/twentytwenty/inc/template-tags.php
@@ -63,6 +63,10 @@ function twentytwenty_site_logo( $args = array(), $display = true ) {
 		$contents  = sprintf( $args['logo'], $logo, esc_html( $site_title ) );
 		$classname = $args['logo_class'];
 	} else {
+		if ( ! $site_title ) {
+			return '';
+		}
+
 		$contents = sprintf( $args['title'], esc_url( get_home_url( null, '/' ) ), esc_html( $site_title ) );
 		if (
 			( is_front_page() || is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ebbe9bd804..438f886723 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60482';
+$wp_version = '6.9-alpha-60483';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.