WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
iandunn 2021-06-23 22:20:59 +00:00
parent 5acf559613
commit 3801e9818a
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/functions.php
View File

@ -3300,13 +3300,6 @@ function get_allowed_mime_types( $user = null ) {
unset( $t['htm|html'], $t['js'] ); 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. * Filters list of allowed mime types and file extensions.
* *

2
wp-includes/script-loader.php
View File

@ -851,7 +851,7 @@ function wp_default_scripts( $scripts ) {
/* translators: %s: File name. */ /* translators: %s: File name. */
'file_exceeds_size_limit' => __( '%s exceeds the maximum upload size for this site.' ), 'file_exceeds_size_limit' => __( '%s exceeds the maximum upload size for this site.' ),
'zero_byte_file' => __( 'This file is empty. Please try another.' ), '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.' ), 'not_an_image' => __( 'This file is not an image. Please try another.' ),
'image_memory_exceeded' => __( 'Memory exceeded. Please try another smaller file.' ), 'image_memory_exceeded' => __( 'Memory exceeded. Please try another smaller file.' ),
'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ), 'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ),

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.