Changeset 44443 for branches/5.0/src/wp-includes/functions.php

Timestamp:

01/07/2019 10:22:03 PM (6 years ago)

Author:

joemcgill

Message:

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.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (1 diff)

branches/5.0/src/wp-includes/functions.php

@@ -2374 +2374 @@
              * 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;
             }