From f19df46584bf79d468142ba868a89b2e3e8dcd25 Mon Sep 17 00:00:00 2001
From: spacedmonkey <spacedmonkey@git.wordpress.org>
Date: Thu, 14 Sep 2023 11:25:19 +0000
Subject: [PATCH] Bundled Theme: Implement the_header_image_tag function for
 enhanced compatibility for older core themes.

The `the_header_image_tag` function was introduced in WordPress 4.4 as part of [35594]. It is used in all themes created post WordPress 4.4 that supported header images. The function `get_header_image_tag` continues to get updated with new image features, like lazy loading, async decoding and fetch priority. To ensure our core themes maintain compatibility and benefit from these enhancements, a backward compatibility shim has been applied, integrating the `the_header_image_tag` function into the following core themes:

- Twenty Ten
- Twenty Eleven
- Twenty Twelve
- Twenty Fourteen
- Twenty Sixteen

This change ensures future compatibility and modern image features are applied for header images to these older themes.

Props spacedmonkey, flixos90, mukesh27.
Fixes #58675.
Built from https://develop.svn.wordpress.org/trunk@56583


git-svn-id: http://core.svn.wordpress.org/trunk@56095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyeleven/functions.php  | 33 +++++++++++++++++++
 wp-content/themes/twentyeleven/header.php     | 12 +------
 wp-content/themes/twentyfourteen/header.php   |  2 +-
 .../twentyfourteen/inc/custom-header.php      | 26 +++++++++++++++
 wp-content/themes/twentysixteen/header.php    | 12 ++++++-
 wp-content/themes/twentyten/functions.php     | 33 +++++++++++++++++++
 wp-content/themes/twentyten/header.php        | 12 +------
 wp-content/themes/twentytwelve/header.php     |  2 +-
 .../themes/twentytwelve/inc/custom-header.php | 24 ++++++++++++++
 wp-includes/version.php                       |  2 +-
 10 files changed, 132 insertions(+), 26 deletions(-)

diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 4c478fd8e3..3ca5da5882 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -440,6 +440,39 @@ if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
 	}
 endif; // twentyeleven_admin_header_image()
 
+
+if ( ! function_exists( 'twentyeleven_header_image' ) ) :
+	/**
+	 * Custom header image markup displayed.
+	 *
+	 * @since Twenty Eleven 4.5
+	 */
+	function twentyeleven_header_image() {
+		$attrs = array(
+			'alt' => get_bloginfo( 'name', 'display' ),
+		);
+
+		// Compatibility with versions of WordPress prior to 3.4.
+		if ( function_exists( 'get_custom_header' ) ) {
+			$custom_header   = get_custom_header();
+			$attrs['width']  = $custom_header->width;
+			$attrs['height'] = $custom_header->height;
+		} else {
+			$attrs['width']  = HEADER_IMAGE_WIDTH;
+			$attrs['height'] = HEADER_IMAGE_HEIGHT;
+		}
+
+		if ( function_exists( 'the_header_image_tag' ) ) {
+			the_header_image_tag( $attrs );
+			return;
+		}
+
+		?>
+		<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $attrs['width'] ); ?>" height="<?php echo esc_attr( $attrs['height'] ); ?>" alt="<?php echo esc_attr( $attrs['alt'] ); ?>" />
+		<?php
+	}
+endif; // twentyeleven_header_image()
+
 /**
  * Set the post excerpt length to 40 words.
  *
diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index 9f1cb96219..df4046f76f 100644
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -111,17 +111,7 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 					// Houston, we have a new header image!
 					echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
 				} else {
-					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) ) {
-						$header_image_width  = get_custom_header()->width;
-						$header_image_height = get_custom_header()->height;
-					} else {
-						$header_image_width  = HEADER_IMAGE_WIDTH;
-						$header_image_height = HEADER_IMAGE_HEIGHT;
-					}
-					?>
-					<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
-					<?php
+					twentyeleven_header_image();
 				} // End check for featured image or standard header.
 				?>
 			</a>
diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index ad3e128b0c..10b31fbf36 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -36,7 +36,7 @@
 	<?php if ( get_header_image() ) : ?>
 	<div id="site-header">
 		<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
-			<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
+			<?php twentyfourteen_header_image(); ?>
 		</a>
 	</div>
 	<?php endif; ?>
diff --git a/wp-content/themes/twentyfourteen/inc/custom-header.php b/wp-content/themes/twentyfourteen/inc/custom-header.php
index d6692dbb41..9b8f35d7ce 100644
--- a/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -151,3 +151,29 @@ if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
 		<?php
 	}
 endif; // twentyfourteen_admin_header_image()
+
+
+if ( ! function_exists( 'twentyfourteen_header_image' ) ) :
+	/**
+	 * Create the custom header image markup displayed.
+	 *
+	 * @see twentyfourteen_custom_header_setup()
+	 *
+	 * @since Twenty Fourteen 3.8
+	 */
+	function twentyfourteen_header_image() {
+		$custom_header = get_custom_header();
+		$attrs         = array(
+			'alt'    => get_bloginfo( 'name', 'display' ),
+			'height' => $custom_header->height,
+			'width'  => $custom_header->width,
+		);
+		if ( function_exists( 'the_header_image_tag' ) ) {
+			the_header_image_tag( $attrs );
+			return;
+		}
+		?>
+		<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $attrs['width'] ); ?>" height="<?php echo esc_attr( $attrs['height'] ); ?>" alt="<?php echo esc_attr( $attrs['alt'] ); ?>" />
+		<?php
+	}
+endif; // twentyfourteen_header_image()
diff --git a/wp-content/themes/twentysixteen/header.php b/wp-content/themes/twentysixteen/header.php
index 2ad0f66c67..73b05335c2 100644
--- a/wp-content/themes/twentysixteen/header.php
+++ b/wp-content/themes/twentysixteen/header.php
@@ -102,7 +102,17 @@
 				?>
 				<div class="header-image">
 					<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
-						<img src="<?php header_image(); ?>" srcset="<?php echo esc_attr( wp_get_attachment_image_srcset( get_custom_header()->attachment_id ) ); ?>" sizes="<?php echo esc_attr( $custom_header_sizes ); ?>" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
+						<?php
+						$custom_header = get_custom_header();
+						$attrs         = array(
+							'alt'    => get_bloginfo( 'name', 'display' ),
+							'sizes'  => $custom_header_sizes,
+							'height' => $custom_header->height,
+							'width'  => $custom_header->width,
+						);
+
+						the_header_image_tag( $attrs );
+						?>
 					</a>
 				</div><!-- .header-image -->
 			<?php endif; // End header image check. ?>
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 36e20c442c..eb4fe64ef3 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -290,6 +290,39 @@ if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 	}
 endif;
 
+
+if ( ! function_exists( 'twentyten_header_image' ) ) :
+	/**
+	 * Custom header image markup displayed.
+	 *
+	 * @since Twenty Ten 4.0
+	 */
+	function twentyten_header_image() {
+		$attrs = array(
+			'alt' => get_bloginfo( 'name', 'display' ),
+		);
+
+		// Compatibility with versions of WordPress prior to 3.4.
+		if ( function_exists( 'get_custom_header' ) ) {
+			$custom_header   = get_custom_header();
+			$attrs['width']  = $custom_header->width;
+			$attrs['height'] = $custom_header->height;
+		} else {
+			$attrs['width']  = HEADER_IMAGE_WIDTH;
+			$attrs['height'] = HEADER_IMAGE_HEIGHT;
+		}
+
+		if ( function_exists( 'the_header_image_tag' ) ) {
+			the_header_image_tag( $attrs );
+			return;
+		}
+
+		?>
+		<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $attrs['width'] ); ?>" height="<?php echo esc_attr( $attrs['height'] ); ?>" alt="<?php echo esc_attr( $attrs['alt'] ); ?>" />
+		<?php
+	}
+endif; // twentyten_header_image()
+
 /**
  * Show a home link for our wp_nav_menu() fallback, wp_page_menu().
  *
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 7a47057fef..a03677452f 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -95,17 +95,7 @@ if ( is_singular() && get_option( 'thread_comments' ) ) {
 					// Houston, we have a new header image!
 					echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
 				} else {
-					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) ) {
-						$header_image_width  = get_custom_header()->width;
-						$header_image_height = get_custom_header()->height;
-					} else {
-						$header_image_width  = HEADER_IMAGE_WIDTH;
-						$header_image_height = HEADER_IMAGE_HEIGHT;
-					}
-					?>
-					<img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="" />
-					<?php
+					twentyten_header_image();
 				} // End check for featured image or standard header.
 				?>
 			</div><!-- #branding -->
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 0d4cf9441a..13fbebead9 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -54,7 +54,7 @@
 		</nav><!-- #site-navigation -->
 
 		<?php if ( get_header_image() ) : ?>
-		<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php header_image(); ?>" class="header-image" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" /></a>
+		<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php twentytwelve_header_image(); ?></a>
 		<?php endif; ?>
 	</header><!-- #masthead -->
 
diff --git a/wp-content/themes/twentytwelve/inc/custom-header.php b/wp-content/themes/twentytwelve/inc/custom-header.php
index 84b3556c24..a20df42367 100644
--- a/wp-content/themes/twentytwelve/inc/custom-header.php
+++ b/wp-content/themes/twentytwelve/inc/custom-header.php
@@ -166,3 +166,27 @@ function twentytwelve_admin_header_image() {
 	</div>
 	<?php
 }
+
+
+/**
+ * Output markup to be displayed.
+ *
+ * @since Twenty Twelve 4.1
+ */
+function twentytwelve_header_image() {
+	$custom_header = get_custom_header();
+	$attrs         = array(
+		'alt'    => get_bloginfo( 'name', 'display' ),
+		'class'  => 'header-image',
+		'height' => $custom_header->height,
+		'width'  => $custom_header->width,
+	);
+
+	if ( function_exists( 'the_header_image_tag' ) ) {
+		the_header_image_tag( $attrs );
+		return;
+	}
+	?>
+	<img src="<?php header_image(); ?>" class="<?php echo esc_attr( $attrs['class'] ); ?>" width="<?php echo esc_attr( $attrs['width'] ); ?>" height="<?php echo esc_attr( $attrs['height'] ); ?>" alt="<?php echo esc_attr( $attrs['alt'] ); ?>" />
+	<?php
+}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index beb2f28737..9769affc9d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-alpha-56581';
+$wp_version = '6.4-alpha-56583';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.