From c00c116484afc4c90022f324a17282c52cf60e4f Mon Sep 17 00:00:00 2001 From: Ian Dunn Date: Wed, 23 Jun 2021 22:19:54 +0000 Subject: [PATCH] Media: Revert r51211 to restore `ms-files.php` assets. r51211 accidentally introduced a fatal error for Multisite instances with `ms_files_rewriting` enabled. Reverting removes the error, and the original purpose of the commit can be solved in another way. Props otto42, barry, ryelle, azaozz. Fixes #53492. See #53475. git-svn-id: https://develop.svn.wordpress.org/trunk@51223 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 7 ------- src/wp-includes/script-loader.php | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 8835ecfec4..c834a01ef4 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -3300,13 +3300,6 @@ function get_allowed_mime_types( $user = null ) { unset( $t['htm|html'], $t['js'] ); } - // Add WebP if the server supports it. - unset( $t['webp'] ); - - if ( wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) { - $t['webp'] = 'image/webp'; - } - /** * Filters list of allowed mime types and file extensions. * diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 9c54709a7a..d1c2450b5d 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -851,7 +851,7 @@ function wp_default_scripts( $scripts ) { /* translators: %s: File name. */ 'file_exceeds_size_limit' => __( '%s exceeds the maximum upload size for this site.' ), 'zero_byte_file' => __( 'This file is empty. Please try another.' ), - 'invalid_filetype' => __( 'Sorry, this file type is not supported.' ), + 'invalid_filetype' => __( 'Sorry, this file type is not permitted for security reasons.' ), 'not_an_image' => __( 'This file is not an image. Please try another.' ), 'image_memory_exceeded' => __( 'Memory exceeded. Please try another smaller file.' ), 'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ),