![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Ticket #5482: unique_filename_fix-r6400.patch
| File unique_filename_fix-r6400.patch, 2.0 KB (added by , 19 years ago) |
|---|
-
wordpress/wp-includes/functions.php
1064 1064 } 1065 1065 1066 1066 // return a filename that is sanitized and unique for the given directory 1067 function wp_unique_filename( $dir, $ name, $ext, $unique_filename_callback = NULL ) {1067 function wp_unique_filename( $dir, $filename, $unique_filename_callback = NULL ) { 1068 1068 1069 // separate the filename into a name and extension 1070 $info = pathinfo($filename); 1071 $ext = $info['extension']; 1072 $name = basename($filename, ".{$ext}"); 1073 1069 1074 // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied. 1070 1075 if ( $unique_filename_callback && function_exists( $unique_filename_callback ) ) { 1071 1076 $filename = $unique_filename_callback( $dir, $name ); … … 1103 1108 1104 1109 if ( $upload['error'] !== false ) 1105 1110 return $upload; 1106 1107 $filename = $name;1108 $path_parts = pathinfo( $filename );1109 $ext = $path_parts['extension'];1110 1111 1111 $filename = wp_unique_filename( $upload['path'], $ path_parts['basename'], $ext);1112 $filename = wp_unique_filename( $upload['path'], $name ); 1112 1113 1113 1114 $new_file = $upload['path'] . "/$filename"; 1114 1115 if ( ! wp_mkdir_p( dirname( $new_file ) ) ) { -
wordpress/wp-admin/includes/file.php
147 147 if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) 148 148 return $upload_error_handler( $file, $uploads['error'] ); 149 149 150 $filename = wp_unique_filename( $uploads['path'], $file['name'], $ ext, $unique_filename_callback );150 $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); 151 151 152 152 // Move the file to the uploads dir 153 153 $new_file = $uploads['path'] . "/$filename";
