From 4e8ff35289bfb4f06f55288158df23ba08b91043 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 21 Jan 2021 12:16:59 +0000
Subject: [PATCH] Twenty Twenty-One: Consistently use Yoda condition for
 `display_title_and_tagline` setting.

Props mukesh27.
Fixes #52329.
Built from https://develop.svn.wordpress.org/trunk@49994


git-svn-id: http://core.svn.wordpress.org/trunk@49695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../twentytwentyone/template-parts/header/site-branding.php     | 2 +-
 .../twentytwentyone/template-parts/header/site-header.php       | 2 +-
 wp-includes/version.php                                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentytwentyone/template-parts/header/site-branding.php b/wp-content/themes/twentytwentyone/template-parts/header/site-branding.php
index 3e7741877c..0d53d2c0ad 100644
--- a/wp-content/themes/twentytwentyone/template-parts/header/site-branding.php
+++ b/wp-content/themes/twentytwentyone/template-parts/header/site-branding.php
@@ -34,7 +34,7 @@ $header_class = $show_title ? 'site-title' : 'screen-reader-text';
 		<?php endif; ?>
 	<?php endif; ?>
 
-	<?php if ( $description && get_theme_mod( 'display_title_and_tagline', true ) === true ) : ?>
+	<?php if ( $description && true === get_theme_mod( 'display_title_and_tagline', true ) ) : ?>
 		<p class="site-description">
 			<?php echo $description; // phpcs:ignore WordPress.Security.EscapeOutput ?>
 		</p>
diff --git a/wp-content/themes/twentytwentyone/template-parts/header/site-header.php b/wp-content/themes/twentytwentyone/template-parts/header/site-header.php
index 3072d5339e..caa6d46cbf 100644
--- a/wp-content/themes/twentytwentyone/template-parts/header/site-header.php
+++ b/wp-content/themes/twentytwentyone/template-parts/header/site-header.php
@@ -9,7 +9,7 @@
 
 $wrapper_classes  = 'site-header';
 $wrapper_classes .= has_custom_logo() ? ' has-logo' : '';
-$wrapper_classes .= true === get_theme_mod( 'display_title_and_tagline', true ) ? ' has-title-and-tagline' : '';
+$wrapper_classes .= ( true === get_theme_mod( 'display_title_and_tagline', true ) ) ? ' has-title-and-tagline' : '';
 $wrapper_classes .= has_nav_menu( 'primary' ) ? ' has-menu' : '';
 ?>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f05f6efafd..91c2b6e01a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49993';
+$wp_version = '5.7-alpha-49994';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.