Ticket #33242: 33242.diff

src/wp-admin/includes/file.php

@@ -349 +349 @@
                         $file['name'] = $proper_filename;
                 }
                 if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-                        return call_user_func_array( $upload_error_handler, array( &$file, __( 'Sorry, this file type is not permitted for security reasons.' ) ) );
+                        return call_user_func_array( $upload_error_handler, array( &$file, __( 'Sorry, this file type is not permitted for upload.' ) ) );
                 }
                 if ( ! $type ) {
                         $type = $file['type'];

src/wp-includes/functions.php

@@ -2134 +2134 @@
 
         $wp_filetype = wp_check_filetype( $name );
         if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-                return array( 'error' => __( 'Invalid file type' ) );
+                return array( 'error' => __( 'Sorry, this file type is not permitted for upload.' ) );
 
         $upload = wp_upload_dir( $time );
 

src/wp-includes/script-loader.php

@@ -278 +278 @@
                 'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
                 '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' => __('This file type is not allowed. Please try another.'),
+                'invalid_filetype' => __('Sorry, this file type is not permitted for upload.'),
                 '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.'),