From 4a80373bdfe7495ad9103a3e342f787934825236 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Mon, 7 Jan 2019 21:09:49 +0000 Subject: [PATCH] PHPCS: Fix formatting issues. Fixes formatting issues introduced in [44438]. See #45615. Built from https://develop.svn.wordpress.org/trunk@44441 git-svn-id: http://core.svn.wordpress.org/trunk@44272 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 16 +++++++++++----- wp-includes/version.php | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 8c209ec6bf..b00a47c1d8 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2574,23 +2574,29 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) { } } elseif ( 'text/plain' === $real_mime ) { // A few common file types are occasionally detected as text/plain; allow those. - if ( ! in_array( $type, array( + if ( ! in_array( + $type, + array( 'text/plain', 'text/csv', 'text/richtext', 'text/tsv', 'text/vtt', - ) ) + ) + ) ) { $type = $ext = false; } - } elseif( 'text/rtf' === $real_mime ) { + } elseif ( 'text/rtf' === $real_mime ) { // Special casing for RTF files. - if ( ! in_array( $type, array( + if ( ! in_array( + $type, + array( 'text/rtf', 'text/plain', 'application/rtf', - ) ) + ) + ) ) { $type = $ext = false; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 8561b66236..41e35ef6eb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44439'; +$wp_version = '5.1-alpha-44441'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.