From 3801e9818a676449aa933d1e980eee17584f1e22 Mon Sep 17 00:00:00 2001
From: iandunn <iandunn@git.wordpress.org>
Date: Wed, 23 Jun 2021 22:20:59 +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.

Built from https://develop.svn.wordpress.org/trunk@51223


git-svn-id: http://core.svn.wordpress.org/trunk@50832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php     | 7 -------
 wp-includes/script-loader.php | 2 +-
 wp-includes/version.php       | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 8835ecfec4..c834a01ef4 100644
--- a/wp-includes/functions.php
+++ b/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/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 9c54709a7a..d1c2450b5d 100644
--- a/wp-includes/script-loader.php
+++ b/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.' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index dae059b946..72566aac95 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-beta3-51222';
+$wp_version = '5.8-beta3-51223';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.