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

Timestamp:

05/04/2009 08:20:48 PM (17 years ago)

Author:

ryan

Message:

sanitize_file_name() improvements. Props sivel. fixes #9416

File:

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

trunk/wp-includes/functions.php

@@ -2014 +2014 @@
  */
 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" )
@@ -2031 +2033 @@
 
         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" ) ) {