Skip to content

Fix: Prevent empty markup when site title or description is empty #8582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Sukhendu2002 wants to merge 10 commits into from
Closed

Fix: Prevent empty markup when site title or description is empty #8582

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b218bbe
Fix empty markup when site title or description is empty
Sukhendu2002 Mar 25, 2025
ca71d45
Remove inline comment
Sukhendu2002 Mar 25, 2025
57fb74d
Fix PHPCS Errors
Sukhendu2002 Mar 25, 2025
7978741
refactor: optimize site title/description checks across default themes
Sukhendu2002 May 22, 2025
5f5b651
Fix PHPCS Errors
Sukhendu2002 May 22, 2025
88d029a
refactor: replace bloginfo() calls with direct variable usage for sit…
Sukhendu2002 May 26, 2025
fee9e9d
Fix PHPCS Errors
Sukhendu2002 May 26, 2025
50c42de
Fix indentation
Sukhendu2002 May 26, 2025
7fd3403
Remove whitespace
Sukhendu2002 May 26, 2025
005e8b9
fix: add display parameter to get_bloginfo calls
Sukhendu2002 Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/wp-content/themes/twentyeleven/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,26 @@
<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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated
$site_description = get_bloginfo( 'description' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

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' ) ) {
Expand Down
29 changes: 15 additions & 14 deletions src/wp-content/themes/twentyfifteen/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) :
twentyfifteen_the_custom_logo();
Comment thread
Sukhendu2002 marked this conversation as resolved.
$is_front = ! is_paged() && ( is_front_page() || ( is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) );
$site_name = get_bloginfo( 'name' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

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 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;
<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;
$description = get_bloginfo( 'description', 'display' );
if ( $description || is_customize_preview() ) :
Comment thread
Sukhendu2002 marked this conversation as resolved.
?>
<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 -->
Expand Down
7 changes: 6 additions & 1 deletion src/wp-content/themes/twentyfourteen/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated
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">
Expand Down
18 changes: 11 additions & 7 deletions src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

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() ) :
Expand Down
16 changes: 10 additions & 6 deletions src/wp-content/themes/twentysixteen/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

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;

Expand Down
32 changes: 22 additions & 10 deletions src/wp-content/themes/twentyten/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,29 @@
<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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated
$site_description = get_bloginfo( 'description' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

Comment thread
Sukhendu2002 marked this conversation as resolved.
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.
Expand Down
15 changes: 12 additions & 3 deletions src/wp-content/themes/twentythirteen/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated
$site_description = get_bloginfo( 'description' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

?>
<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">
Expand Down
18 changes: 15 additions & 3 deletions src/wp-content/themes/twentytwelve/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated
$site_description = get_bloginfo( 'description' );
Comment thread
Sukhendu2002 marked this conversation as resolved.
Outdated

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">
Expand Down
4 changes: 4 additions & 0 deletions src/wp-content/themes/twentytwenty/inc/template-tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) )
Expand Down
Loading