vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sanitize_file_name() improvements. Props sivel. fixes #9416

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@11178 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2009-05-04 20:20:48 +00:00
parent dbf0dd1a1a
commit d2d104d968
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/functions.php
View File

@@ -2013,12 +2013,14 @@ function wp_upload_dir( $time = null ) {
* @return string New filename, if given wasn't unique.
*/
function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
$filename = strtolower( $filename );
// sanitize the file name before we begin processing
$filename = sanitize_file_name($filename);
// separate the filename into a name and extension
$info = pathinfo($filename);
$ext = !empty($info['extension']) ? $info['extension'] : '';
$name = basename($filename, ".{$ext}");
// edge case: if file is named '.ext', treat as an empty name
if( $name === ".$ext" )
$name = '';
@@ -2030,11 +2032,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
$number = '';
if ( !empty( $ext ) )
$ext = strtolower( ".$ext" );
$filename = str_replace( $ext, '', $filename );
// Strip % so the server doesn't try to decode entities.
$filename = str_replace('%', '', sanitize_title_with_dashes( $filename ) ) . $ext;
$ext = ".$ext";
while ( file_exists( $dir . "/$filename" ) ) {
if ( '' == "$number$ext" )