mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-03-22 04:49:49 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Media: Revert r51211 to restore ms-files.php assets.

Browse Source 
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
This commit is contained in:
Ian Dunn 2021-06-23 22:19:54 +00:00
parent 23e2748316
commit c00c116484
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-includes/functions.php
View File

@ -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.
*

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

@ -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.' ),