Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props pavelevap, jackreichert.
Fixes #33242.
Built from https://develop.svn.wordpress.org/trunk@39891


git-svn-id: http://core.svn.wordpress.org/trunk@39828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-01-12 06:29:43 +00:00
parent 327a11ad65
commit 11d81ecc7c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 );
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 );

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

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-39890';
$wp_version = '4.8-alpha-39891';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.