WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Improve handling of extensionless filenames. 

Merge of [37756] to the 4.4 branch.

See #37111.
Built from https://develop.svn.wordpress.org/branches/4.4@37810


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Joe McGill 2016-06-21 14:53:31 +00:00
parent bf3b6b800d
commit f68837fd6f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/formatting.php
View File

@ -1364,7 +1364,8 @@ function remove_accents( $string ) {
* operating systems and special characters requiring special escaping * operating systems and special characters requiring special escaping
* to manipulate at the command line. Replaces spaces and consecutive * to manipulate at the command line. Replaces spaces and consecutive
* dashes with a single dash. Trims period, dash and underscore from beginning * dashes with a single dash. Trims period, dash and underscore from beginning
* and end of filename. * and end of filename. It is not guaranteed that this function will return a
* filename that is allowed to be uploaded.
* *
* @since 2.1.0 * @since 2.1.0
* *
@ -1389,6 +1390,14 @@ function sanitize_file_name( $filename ) {
$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename ); $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
$filename = trim( $filename, '.-_' ); $filename = trim( $filename, '.-_' );
if ( false === strpos( $filename, '.' ) ) {
$mime_types = wp_get_mime_types();
$filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
if ( $filetype['ext'] === $filename ) {
$filename = 'unnamed-file.' . $filetype['ext'];
}
}
// Split the filename into a base and extension[s] // Split the filename into a base and extension[s]
$parts = explode('.', $filename); $parts = explode('.', $filename);