sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media: Use a consistent error message for file type errors on uploading.

Browse Source 
Props pavelevap, jackreichert.
Fixes #33242.

git-svn-id: https://develop.svn.wordpress.org/trunk@39891 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2017-01-12 06:28:32 +00:00
parent e9be135754
commit d788c3ffed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2139,7 +2139,7 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
$wp_filetype = wp_check_filetype( $name ); $wp_filetype = wp_check_filetype( $name );
if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) 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 security reasons.' ) );
$upload = wp_upload_dir( $time ); $upload = wp_upload_dir( $time );

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

@ -280,7 +280,7 @@ function wp_default_scripts( &$scripts ) {
'queue_limit_exceeded' => __('You have attempted to queue too many files.'), 'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
'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' => __('This file type is not allowed. Please try another.'), '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.'),