From 81de03f277f41725480e68d4e60c5ff70a003fb0 Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Fri, 13 Sep 2024 05:23:22 +0000
Subject: [PATCH] Upgrade/Install: Indicate HEIC support when checking
 upgrades.

Adds tracking of HEIC image type support alongside WebP and AVID image types when requesting upgrade from WordPress.org

Props adamsilverstein, swissspidy, dd32, mukesh27.
Fixes #61981.

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


git-svn-id: http://core.svn.wordpress.org/trunk@58414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/update.php  | 6 ++++--
 wp-includes/version.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/update.php b/wp-includes/update.php
index c623b248b9..79ed9cd574 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -115,24 +115,26 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 		// Filter to supported values.
 		$gd_info = array_filter( $gd_info );
 
-		// Add data for GD WebP and AVIF support.
+		// Add data for GD WebP, AVIF and HEIC support.
 		$query['image_support']['gd'] = array_keys(
 			array_filter(
 				array(
 					'webp' => isset( $gd_info['WebP Support'] ),
 					'avif' => isset( $gd_info['AVIF Support'] ),
+					'heic' => isset( $gd_info['HEIC Support'] ),
 				)
 			)
 		);
 	}
 
 	if ( class_exists( 'Imagick' ) ) {
-		// Add data for Imagick WebP and AVIF support.
+		// Add data for Imagick WebP, AVIF and HEIC support.
 		$query['image_support']['imagick'] = array_keys(
 			array_filter(
 				array(
 					'webp' => ! empty( Imagick::queryFormats( 'WEBP' ) ),
 					'avif' => ! empty( Imagick::queryFormats( 'AVIF' ) ),
+					'heic' => ! empty( Imagick::queryFormats( 'HEIC' ) ),
 				)
 			)
 		);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6823de6334..2c63922b96 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-59017';
+$wp_version = '6.7-alpha-59018';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.