Changeset 51223

Timestamp:

06/23/2021 10:19:54 PM (3 years ago)

Author:

iandunn

Message:

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.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -3301 +3301 @@
     }
 
-    // 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.

trunk/src/wp-includes/script-loader.php

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