From f6bd4ab08e7ad41403a26736d548fb336feb9207 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Wed, 30 Aug 2023 22:32:19 +0000 Subject: [PATCH] Upload: Add a MIME type exception for `.docx` generated by Google Docs. This changeset adds an exception to prevent permission issues on `.docx` generated by Google Docs. This is a temporary fix for an upstream bug on the `finfo_file()` PHP function which returns a redundant MIME type for these documents. Props winterstreet, jakariaistauk, mujuonly, mi5t4n, annashopina, audrasjb, azaozz, mikeschroder, oglekler. Fixes #57898. Built from https://develop.svn.wordpress.org/trunk@56497 git-svn-id: http://core.svn.wordpress.org/trunk@56009 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 5 +++++ wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index be03264455..dfe8af4335 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3150,6 +3150,11 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) { $real_mime = finfo_file( $finfo, $file ); finfo_close( $finfo ); + // finfo_file() returns redudant mime type for Google docs, see #57898. + if ( 'application/vnd.openxmlformats-officedocument.wordprocessingml.documentapplication/vnd.openxmlformats-officedocument.wordprocessingml.document' === $real_mime ) { + $real_mime = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; + } + // fileinfo often misidentifies obscure files as one of these types. $nonspecific_types = array( 'application/octet-stream', diff --git a/wp-includes/version.php b/wp-includes/version.php index 894fa13c09..d8af836c39 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56496'; +$wp_version = '6.4-alpha-56497'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.