Changeset 7440

Timestamp:

03/21/2008 04:03:33 AM (18 years ago)

Author:

markjaquith

Message:

Prevent uploads from overwriting each other. props neodude. fixes #6294

File:

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

trunk/wp-includes/functions.php

@@ -1123 +1123 @@
         $ext = $info['extension'];
         $name = basename($filename, ".{$ext}");
+        
+        // edge case: if file is named '.ext', treat as an empty name
+        if( $name === ".$ext" )
+                $name = '';
 
         // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied.
@@ -1129 +1133 @@
         } else {
                 $number = '';
-                $filename = str_replace( '#', '_', $name );
-                $filename = str_replace( array( '\\', "'" ), '', $filename );
-                if ( empty( $ext) )
+
+                if ( empty( $ext ) )
                         $ext = '';
                 else
                         $ext = strtolower( ".$ext" );
-                $filename = $filename . $ext;
+
+                $filename = str_replace( $ext, '', $filename );
+                $filename = sanitize_title_with_dashes( $filename ) . $ext;
+
                 while ( file_exists( $dir . "/$filename" ) ) {
                         if ( '' == "$number$ext" )
@@ -1142 +1148 @@
                                 $filename = str_replace( "$number$ext", ++$number . $ext, $filename );
                 }
-                $filename = str_replace( $ext, '', $filename );
-                $filename = sanitize_title_with_dashes( $filename ) . $ext;
         }