From e2aeb780666021a9ea1a094ca7ae73211fe69e5e Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Wed, 14 Feb 2024 17:26:25 +0000 Subject: [PATCH] Editor: Check PHP 8.1.12 for woff/woff2 mime types in WP_Font_Utils. Fixes a bug where fonts could not be installed in PHP 8.1.0 through 8.1.11 due to incorrect MIME type assignment. While `WP_Font_Utils::get_allowed_font_mime_types()` conditionally sets the MIME type for woff and woff2, it incorrectly checks against PHP 8.1.0. The MIME type change did not occur until PHP 8.1.12. References: * [https://github.com/php/php-src/issues/8805 PHP-src: finfo returns wrong mime type for woff/woff2 files]. * [https://www.php.net/ChangeLog-8.php#8.1.12 PHP 8.1.12 changelog]. * Tests: Adjust the expected mime type for WOFF fonts on PHP 8.1.12+ [55463]. * [https://github.com/WordPress/gutenberg/pull/59015 Gutenberg PR 59015]. Follow-up to [57539]. Props costdev, kafleg, hellofromTonya. Fixes 60536. git-svn-id: https://develop.svn.wordpress.org/trunk@57632 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/fonts/class-wp-font-utils.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/fonts/class-wp-font-utils.php b/src/wp-includes/fonts/class-wp-font-utils.php index 22baff3a5a..e9155b8e59 100644 --- a/src/wp-includes/fonts/class-wp-font-utils.php +++ b/src/wp-includes/fonts/class-wp-font-utils.php @@ -231,8 +231,8 @@ class WP_Font_Utils { return array( 'otf' => 'application/vnd.ms-opentype', 'ttf' => PHP_VERSION_ID >= 70400 ? 'font/sfnt' : $php_7_ttf_mime_type, - 'woff' => PHP_VERSION_ID >= 80100 ? 'font/woff' : 'application/font-woff', - 'woff2' => PHP_VERSION_ID >= 80100 ? 'font/woff2' : 'application/font-woff2', + 'woff' => PHP_VERSION_ID >= 80112 ? 'font/woff' : 'application/font-woff', + 'woff2' => PHP_VERSION_ID >= 80112 ? 'font/woff2' : 'application/font-woff2', ); } }