From 7ca9a37c89e327f6b09e274526aee02c1b476bd9 Mon Sep 17 00:00:00 2001
From: Joe McGill <joemcgill@gmail.com>
Date: Mon, 7 Jan 2019 22:23:52 +0000
Subject: [PATCH] Upload: Fix upload failures of common text file types.
This adds some special case handling in 'wp_check_filetype_and_ext()' that prevents some common file types from being blocked based on mismatched MIME checks, which were made more strict in WordPress 5.0.1.
Merges [44438], [44439], [44441], and [44442] to the 4.9 branch.
Props Kloon, birgire, tellyworth, joemcgill.
See #45615.
Built from https://develop.svn.wordpress.org/branches/5.0@44443
git-svn-id: http://core.svn.wordpress.org/branches/5.0@44274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-includes/functions.php | 29 ++++++++++++++++++++++++++++-
wp-includes/version.php | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 53d0073ab5..58a00528a9 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2373,10 +2373,37 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
* This means that common mismatches are forgiven: application/vnd.apple.numbers is often misidentified as application/zip,
* and some media files are commonly named with the wrong extension (.mov instead of .mp4)
*/
-
if ( substr( $real_mime, 0, strcspn( $real_mime, '/' ) ) !== substr( $type, 0, strcspn( $type, '/' ) ) ) {
$type = $ext = false;
}
+ } elseif ( 'text/plain' === $real_mime ) {
+ // A few common file types are occasionally detected as text/plain; allow those.
+ if ( ! in_array(
+ $type,
+ array(
+ 'text/plain',
+ 'text/csv',
+ 'text/richtext',
+ 'text/tsv',
+ 'text/vtt',
+ )
+ )
+ ) {
+ $type = $ext = false;
+ }
+ } elseif ( 'text/rtf' === $real_mime ) {
+ // Special casing for RTF files.
+ if ( ! in_array(
+ $type,
+ array(
+ 'text/rtf',
+ 'text/plain',
+ 'application/rtf',
+ )
+ )
+ ) {
+ $type = $ext = false;
+ }
} else {
if ( $type !== $real_mime ) {
/*
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ed545fd939..642e20de48 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '5.0.3-alpha-44440';
+$wp_version = '5.0.3-alpha-44443';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.