From 02fa7656d1135d057ce2bc7350a81e81fa1ed8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Wed, 30 Nov 2016 23:39:31 +0000
Subject: [PATCH] Twenty Seventeen: Make fixed navigation apply at correct
 height on front page, without header video or image

Props laurelfulford, littlebigthing.

Merges [39392] to the 4.7 branch.
Fixes #38927 for 4.7.

Built from https://develop.svn.wordpress.org/branches/4.7@39394


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../template-parts/header/header-image.php                | 8 +++++---
 wp-includes/version.php                                   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/template-parts/header/header-image.php b/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
index 5dea9d812e..3f13048bd5 100644
--- a/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
+++ b/wp-content/themes/twentyseventeen/template-parts/header/header-image.php
@@ -11,9 +11,11 @@
 ?>
 <div class="custom-header">
 
-	<div class="custom-header-image">
-		<?php the_custom_header_markup(); ?>
-	</div>
+	<?php if ( has_custom_header() ) : ?>
+		<div class="custom-header-image">
+			<?php the_custom_header_markup(); ?>
+		</div>
+	<?php endif; ?>
 
 	<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5f67beb906..ce473824b6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-RC1-39391';
+$wp_version = '4.7-RC1-39394';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.