From 4177e37593b9d6321f3a9a271f05aec71e850e63 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Tue, 20 Dec 2016 23:00:43 +0000
Subject: [PATCH] Twenty Seventeen: Hardens the logic for calling featured
 image in `header.php`

This change uses `get_queried_object_id()` here since the `$post` global may not be set before a call to `the_post()`.

Props westonruter.

Fixes #39302.

Built from https://develop.svn.wordpress.org/trunk@39624


git-svn-id: http://core.svn.wordpress.org/trunk@39564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/header.php | 10 +++++++---
 wp-includes/version.php                      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/header.php b/wp-content/themes/twentyseventeen/header.php
index 30d7d2a7c2..27148be6d4 100644
--- a/wp-content/themes/twentyseventeen/header.php
+++ b/wp-content/themes/twentyseventeen/header.php
@@ -41,10 +41,14 @@
 	</header><!-- #masthead -->
 
 	<?php
-	// If a regular post or page, and not the front page, show the featured image.
-	if ( has_post_thumbnail() && ( is_single() || ( is_page() && ! twentyseventeen_is_frontpage() ) ) ) :
+
+	/*
+	 * If a regular post or page, and not the front page, show the featured image.
+	 * Using get_queried_object_id() here since the $post global may not be set before a call to the_post().
+	 */
+	if ( ( is_single() || ( is_page() && ! twentyseventeen_is_frontpage() ) ) && has_post_thumbnail( get_queried_object_id() ) ) :
 		echo '<div class="single-featured-image-header">';
-		the_post_thumbnail( 'twentyseventeen-featured-image' );
+		echo get_the_post_thumbnail( get_queried_object_id(), 'twentyseventeen-featured-image' );
 		echo '</div><!-- .single-featured-image-header -->';
 	endif;
 	?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b0ca708cbc..68891eb6dc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-39623';
+$wp_version = '4.8-alpha-39624';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.