Changeset 6401 for trunk/wp-includes/functions.php

Timestamp:

12/18/2007 03:32:43 AM (18 years ago)

Author:

ryan

Message:

unique filename fixes from tellyworth. fixes #5482

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -1065 +1065 @@
 
 // return a filename that is sanitized and unique for the given directory
-function wp_unique_filename( $dir, $name, $ext, $unique_filename_callback = NULL ) {
+function wp_unique_filename( $dir, $filename, $unique_filename_callback = NULL ) {
+    
+    // separate the filename into a name and extension
+    $info = pathinfo($filename);
+    $ext = $info['extension'];
+    $name = basename($filename, ".{$ext}");
     
     // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
@@ -1104 +1109 @@
     if ( $upload['error'] !== false )
         return $upload;
-
-    $filename = $name;
-    $path_parts = pathinfo( $filename );
-    $ext = $path_parts['extension'];
     
-    $filename = wp_unique_filename( $upload['path'], $path_parts['basename'], $ext );
+    $filename = wp_unique_filename( $upload['path'], $name );
 
     $new_file = $upload['path'] . "/$filename";